diff --git a/addons/test_event_full/__init__.py b/addons/test_event_full/__init__.py
index 66a1383e8f3..67dee8c60db 100644
--- a/addons/test_event_full/__init__.py
+++ b/addons/test_event_full/__init__.py
@@ -1,4 +1,2 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import tests
diff --git a/addons/test_event_full/__manifest__.py b/addons/test_event_full/__manifest__.py
index fb1d94f0dc4..4d6116280a9 100644
--- a/addons/test_event_full/__manifest__.py
+++ b/addons/test_event_full/__manifest__.py
@@ -8,7 +8,7 @@
     'description': """
 This module will test the main event flows of Odoo, both frontend and backend.
 It installs sale capabilities, front-end flow, eCommerce, questions and
-automatic lead generation..
+automatic lead generation, full Online support, ...
 """,
     'depends': [
         'event',
@@ -16,10 +16,21 @@ automatic lead generation..
         'event_sale',
         'website_event_crm_questions',
         'website_event_questions',
+        'website_event_online',
+        'website_event_questions',
+        'website_event_meet',
         'website_event_sale',
         'website_event_track',
+        'website_event_track_online',
+        'website_event_track_exhibitor',
+        'website_event_track_session',
+        'website_event_track_live',
+        'website_event_track_quiz',
+    ],
+    'data': [
+        'views/assets.xml',
+    ],
+    'demo': [
     ],
-    'demo': [],
-    'data': [],
     'installable': True,
 }
diff --git a/addons/test_event_full/static/src/js/tours/wevent_register_tour.js b/addons/test_event_full/static/src/js/tours/wevent_register_tour.js
new file mode 100644
index 00000000000..7441ad07340
--- /dev/null
+++ b/addons/test_event_full/static/src/js/tours/wevent_register_tour.js
@@ -0,0 +1,147 @@
+odoo.define('test_event_full.tour.register', function (require) {
+"use strict";
+
+var tour = require('web_tour.tour');
+
+/**
+ * TALKS STEPS
+ */
+
+var discoverTalkSteps = function (talkName, fromList, reminderOn, toggleReminder) {
+    var steps;
+    if (fromList) {
+        steps = [{
+            content: 'Go on "' + talkName + '" talk in List',
+            trigger: 'a:contains("' + talkName + '")',
+        }];
+    }
+    else {
+        steps = [{
+            content: 'Click on Live Track',
+            trigger: 'article span:contains("' + talkName + '")',
+            run: 'click',
+        }];
+    }
+    if (reminderOn) {
+        steps = steps.concat([{
+            content: "Check Reminder is on",
+            trigger: 'div.o_wetrack_js_reminder i.fa-bell',
+            extra_trigger: 'small.o_wetrack_js_reminder_text:contains("Reminder On")',
+            run: function () {}, // it's a check
+        }]);
+    }
+    else {
+        steps = steps.concat([{
+            content: "Check Reminder is Off",
+            trigger: 'small.o_wetrack_js_reminder_text:contains("Set Reminder")',
+            run: function () {}, // it's a check
+        }]);
+        if (toggleReminder) {
+            steps = steps.concat([{
+                content: "Set Reminder",
+                trigger: 'small.o_wetrack_js_reminder_text',
+                run: 'click',
+            }, {
+                content: "Check Reminder is On",
+                trigger: 'div.o_wetrack_js_reminder i.fa-bell',
+                extra_trigger: 'small.o_wetrack_js_reminder_text:contains("Reminder On")',
+                run: function () {}, // it's a check
+            }]);
+        }
+    }
+    return steps;
+};
+
+
+/**
+ * ROOMS STEPS
+ */
+
+var discoverRoomSteps = function (roomName) {
+    var steps = [{
+        content: 'Go on "' + roomName + '" room in List',
+        trigger: 'a.o_wevent_meeting_room_card h3:contains("' + roomName + '")',
+        run: 'click',
+    }];
+    return steps;
+};
+
+
+/**
+ * REGISTER STEPS
+ */
+
+var registerSteps = [{
+    content: 'Go on Register',
+    trigger: 'li.btn-primary a:contains("Register")',
+}, {
+    content: "Select 2 units of 'Standard' ticket type",
+    extra_trigger: '#wrap:not(:has(a[href*="/event"]:contains("Conference for Architects")))',
+    trigger: 'select:eq(0)',
+    run: 'text 2',
+}, {
+    content: "Click on 'Register' button",
+    extra_trigger: 'select:eq(0):has(option:contains(2):propSelected)',
+    trigger: '.btn-primary:contains("Register")',
+    run: 'click',
+}, {
+    content: "Fill attendees details",
+    trigger: 'form[id="attendee_registration"] .btn:contains("Continue")',
+    run: function () {
+        $("input[name='1-name']").val("Raoulette Poiluchette");
+        $("input[name='1-phone']").val("0456112233");
+        $("input[name='1-email']").val("raoulette@example.com");
+        $("input[name='2-name']").val("Michel Tractopelle");
+        $("input[name='2-phone']").val("0456332211");
+        $("input[name='2-email']").val("michel@example.com");
+    },
+}, {
+    content: "Validate attendees details",
+    extra_trigger: "input[name='1-name'], input[name='2-name'], input[name='3-name']",
+    trigger: 'button:contains("Continue")',
+    run: 'click',
+}];
+
+/**
+ * MAIN STEPS
+ */
+
+var initTourSteps = function (eventName) {
+    return [{
+        content: 'Go on "' + eventName + '" page',
+        trigger: 'a[href*="/event"]:contains("' + eventName + '"):first',
+    }];
+};
+
+var browseTalksSteps = [{
+    content: 'Browse Talks',
+    trigger: 'a:contains("Talks")',
+}];
+
+var browseExhibitorsSteps = [{
+    content: 'Browse Exhibitors',
+    trigger: 'a:contains("Exhibitors")',
+}];
+
+var browseMeetSteps = [{
+    content: 'Browse Meet',
+    trigger: 'a:contains("Community")',
+}];
+
+
+tour.register('wevent_register', {
+    url: '/event',
+    test: true
+}, [].concat(
+        initTourSteps('Online Reveal'),
+        browseTalksSteps,
+        discoverTalkSteps('What This Event Is All About', true, true),
+        browseTalksSteps,
+        discoverTalkSteps('Live Testimonial', false, false, true),
+        browseMeetSteps,
+        discoverRoomSteps('Best wood for furniture'),
+        registerSteps,
+    )
+);
+
+});
diff --git a/addons/test_event_full/tests/__init__.py b/addons/test_event_full/tests/__init__.py
index b3be9a3b6f4..7011f22b294 100644
--- a/addons/test_event_full/tests/__init__.py
+++ b/addons/test_event_full/tests/__init__.py
@@ -2,4 +2,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import common
-from . import test_event_crm
\ No newline at end of file
+from . import test_event_crm
+from . import test_wevent_register
diff --git a/addons/test_event_full/tests/common.py b/addons/test_event_full/tests/common.py
index baa2a396568..e835704647e 100644
--- a/addons/test_event_full/tests/common.py
+++ b/addons/test_event_full/tests/common.py
@@ -1,15 +1,26 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from datetime import datetime, timedelta, time
+
+from odoo import fields
+from odoo.addons.base.tests.common import HttpCaseWithUserDemo, HttpCaseWithUserPortal
 from odoo.addons.event_crm.tests.common import TestEventCrmCommon
+from odoo.addons.sales_team.tests.common import TestSalesCommon
+from odoo.addons.website.tests.test_website_visitor import MockVisitor
+from odoo.addons.website_event_online.tests.common import EventDtPatcher
 
 
-class TestEventFullCommon(TestEventCrmCommon):
+class TestEventFullCommon(TestEventCrmCommon, TestSalesCommon, EventDtPatcher, MockVisitor):
 
     @classmethod
     def setUpClass(cls):
         super(TestEventFullCommon, cls).setUpClass()
 
+        # ------------------------------------------------------------
+        # TICKET INFORMATIONS
+        # ------------------------------------------------------------
+
         cls.event_product = cls.env['product.product'].create({
             'name': 'Test Registration Product',
             'description_sale': 'Mighty Description',
@@ -19,7 +30,15 @@ class TestEventFullCommon(TestEventCrmCommon):
             'type': 'service',
         })
 
+        cls.website = cls.env['website'].search([
+            ('company_id', '=', cls.env.user.company_id.id)
+        ], limit=1)
+
         cls.event_0.write({
+            # event if 8-18 in Europe/Brussels (DST) (first day: begins at 9, last day: ends at 15)
+            'date_begin': datetime.combine(cls.reference_now, time(7, 0)) - timedelta(days=1),
+            'date_end': datetime.combine(cls.reference_now, time(13, 0)) + timedelta(days=1),
+            # ticket informations
             'event_ticket_ids': [
                 (5, 0),
                 (0, 0, {
@@ -33,6 +52,15 @@ class TestEventFullCommon(TestEventCrmCommon):
             ],
         })
 
+        # make a SO for a customer, selling some tickets
+        cls.customer_so = cls.env['sale.order'].with_user(cls.user_sales_salesman).create({
+            'partner_id': cls.event_customer.id,
+        })
+
+        # ------------------------------------------------------------
+        # QUESTIONS
+        # ------------------------------------------------------------
+
         cls.event_question_1 = cls.env['event.question'].create({
             'title': 'Question1',
             'question_type': 'simple_choice',
@@ -60,10 +88,9 @@ class TestEventFullCommon(TestEventCrmCommon):
             'once_per_order': True,
         })
 
-        # make a SO for a customer, selling some tickets
-        cls.customer_so = cls.env['sale.order'].with_user(cls.user_sales_salesman).create({
-            'partner_id': cls.event_customer.id,
-        })
+        # ------------------------------------------------------------
+        # DATA MARSHMALLING
+        # ------------------------------------------------------------
 
         cls.website_customer_data = [{
             'name': 'My Customer %02d' % x,
@@ -100,3 +127,154 @@ class TestEventFullCommon(TestEventCrmCommon):
                     self.assertIn(answer.value_answer_id.name, lead.description)
                 else:
                     self.assertIn(answer.value_text_box, lead.description)  # better: check multi line
+
+
+class TestWEventCommon(HttpCaseWithUserDemo, HttpCaseWithUserPortal, EventDtPatcher, MockVisitor):
+
+    def setUp(self):
+        super(TestWEventCommon, self).setUp()
+
+        self.event_product = self.env['product.product'].create({
+            'name': 'Test Event Registration',
+            'default_code': 'EVENT_REG',
+            'description_sale': 'Mighty Description',
+            'list_price': 10,
+            'event_ok': True,
+            'standard_price': 30.0,
+            'type': 'service',
+        })
+
+        self.event_tag_category_1 = self.env['event.tag.category'].create({
+            'name': 'Type',
+            'sequence': 2,
+        })
+        self.event_tag_category_1_tag_1 = self.env['event.tag'].create({
+            'name': 'Online',
+            'sequence': 10,
+            'category_id': self.event_tag_category_1.id,
+            'color': 8,
+        })
+        self.env['event.event'].search(
+            [('name', 'like', '%Online Reveal%')]
+        ).write(
+            {'name': 'Do not click on me'}
+        )
+        self.event = self.env['event.event'].create({
+            'name': 'Online Reveal TestEvent',
+            'auto_confirm': True,
+            'stage_id': self.env.ref('event.event_stage_booked').id,
+            'address_id': False,
+            'user_id': self.user_demo.id,
+            'tag_ids': [(4, self.event_tag_category_1_tag_1.id)],
+            # event if 8-18 in Europe/Brussels (DST) (first day: begins at 7, last day: ends at 17)
+            'date_tz': 'Europe/Brussels',
+            'date_begin': datetime.combine(self.reference_now, time(5, 0)) - timedelta(days=1),
+            'date_end': datetime.combine(self.reference_now, time(15, 0)) + timedelta(days=1),
+            # ticket informations
+            'event_ticket_ids': [
+                (0, 0, {
+                    'name': 'Standard',
+                    'product_id': self.event_product.id,
+                    'price': 0,
+                }), (0, 0, {
+                    'name': 'VIP',
+                    'product_id': self.event_product.id,
+                    'seats_max': 10,
+                })
+            ],
+            # activate menus
+            'is_published': True,
+            'website_menu': True,
+            'website_track': True,
+            'website_track_proposal': True,
+            'exhibitor_menu': True,
+            'community_menu': True,
+        })
+
+        self.event_customer = self.env['res.partner'].create({
+            'name': 'Constantin Customer',
+            'email': 'constantin@test.example.com',
+            'country_id': self.env.ref('base.be').id,
+            'phone': '0485112233',
+            'mobile': False,
+        })
+        self.event_speaker = self.env['res.partner'].create({
+            'name': 'Brandon Freeman',
+            'email': 'brandon.freeman55@example.com',
+            'phone': '(355)-687-3262',
+        })
+
+        # ------------------------------------------------------------
+        # QUESTIONS
+        # ------------------------------------------------------------
+
+        self.event_question_1 = self.env['event.question'].create({
+            'title': 'Question1',
+            'question_type': 'simple_choice',
+            'event_id': self.event.id,
+            'once_per_order': False,
+            'answer_ids': [
+                (0, 0, {'name': 'Q1-Answer1'}),
+                (0, 0, {'name': 'Q1-Answer2'})
+            ],
+        })
+        self.event_question_2 = self.env['event.question'].create({
+            'title': 'Question2',
+            'question_type': 'simple_choice',
+            'event_id': self.event.id,
+            'once_per_order': True,
+            'answer_ids': [
+                (0, 0, {'name': 'Q2-Answer1'}),
+                (0, 0, {'name': 'Q2-Answer2'})
+            ],
+        })
+        self.event_question_3 = self.env['event.question'].create({
+            'title': 'Question3',
+            'question_type': 'text_box',
+            'event_id': self.event.id,
+            'once_per_order': True,
+        })
+
+        # ------------------------------------------------------------
+        # TRACKS
+        # ------------------------------------------------------------
+
+        self.track_0 = self.env['event.track'].create({
+            'name': 'What This Event Is All About',
+            'event_id': self.event.id,
+            'stage_id': self.env.ref('website_event_track.event_track_stage3').id,
+            'date': datetime.combine(self.reference_now, time(5, 0)),
+            'duration': 2,
+            'is_published': True,
+            'wishlisted_by_default': True,
+            'user_id': self.user_admin.id,
+            'partner_id': self.event_speaker.id,
+        })
+        self.track_1 = self.env['event.track'].create({
+            'name': 'Live Testimonial',
+            'event_id': self.event.id,
+            'stage_id': self.env.ref('website_event_track.event_track_stage3').id,
+            'date': self.reference_now - timedelta(minutes=30),
+            'duration': 0.75,
+            'is_published': True,
+            'user_id': self.user_admin.id,
+            'partner_id': self.event_speaker.id,
+        })
+
+        # ------------------------------------------------------------
+        # MEETING ROOMS
+        # ----------------------------------------------------------
+
+        self.env['event.meeting.room'].create({
+            'name': 'Best wood for furniture',
+            'summary': 'Let\'s talk about wood types for furniture',
+            'target_audience': 'wood expert(s)',
+            'is_pinned': True,
+            'website_published': True,
+            'event_id': self.event.id,
+            'room_lang_id': self.env.ref('base.lang_en').id,
+            'room_max_capacity': '12',
+            'room_participant_count': 9,
+        })
+
+        self.event.flush()
diff --git a/addons/test_event_full/tests/test_wevent_register.py b/addons/test_event_full/tests/test_wevent_register.py
new file mode 100644
index 00000000000..79ec993ab57
--- /dev/null
+++ b/addons/test_event_full/tests/test_wevent_register.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import tests
+from odoo.addons.test_event_full.tests.common import TestWEventCommon
+from odoo.tests.common import HOST
+
+
+@tests.common.tagged('post_install', '-at_install')
+class TestWEventRegister(TestWEventCommon):
+
+    def test_register(self):
+        self.browser_js(
+            '/event',
+            'odoo.__DEBUG__.services["web_tour.tour"].run("wevent_register", 100)',
+            'odoo.__DEBUG__.services["web_tour.tour"].tours.wevent_register.ready',
+            login=None
+        )
diff --git a/addons/test_event_full/views/assets.xml b/addons/test_event_full/views/assets.xml
new file mode 100644
index 00000000000..0b20fc8de0e
--- /dev/null
+++ b/addons/test_event_full/views/assets.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<odoo><data>
+    <template id="assets_tests" inherit_id="web.assets_tests" name="Full Event Tests Assets">
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/test_event_full/static/src/js/tours/wevent_register_tour.js"/>
+        </xpath>
+    </template>
+</data></odoo>
diff --git a/addons/website/tests/test_website_visitor.py b/addons/website/tests/test_website_visitor.py
index db0af8e5039..374594f955c 100644
--- a/addons/website/tests/test_website_visitor.py
+++ b/addons/website/tests/test_website_visitor.py
@@ -119,6 +119,23 @@ class WebsiteVisitorTests(MockVisitor, HttpCaseWithUserDemo):
             len(pages)
         )
 
+    def assertVisitorDeactivated(self, visitor, main_visitor):
+        """ Temporary method to check that a visitor has been de-activated / merged
+        with other visitor, notably in case of login (see User.authenticate() as
+        well as Visitor._link_to_visitor() ).
+
+        As final result depends on installed modules (see overrides) due to stable
+        improvements linked to EventOnline, this method contains a hack to avoid
+        doing too much overrides just for that behavior. """
+        if 'parent_id' in self.env['website.visitor']:
+            self.assertTrue(bool(visitor))
+            self.assertFalse(visitor.active)
+            self.assertTrue(main_visitor.active)
+            self.assertEqual(visitor.parent_id, main_visitor)
+        else:
+            self.assertFalse(visitor)
+            self.assertTrue(bool(main_visitor))
+
     def test_visitor_creation_on_tracked_page(self):
         """ Test various flows involving visitor creation and update. """
         existing_visitors = self.env['website.visitor'].search([])
@@ -209,7 +226,7 @@ class WebsiteVisitorTests(MockVisitor, HttpCaseWithUserDemo):
 
         # one visitor is deleted
         visitor_anonymous = self.env['website.visitor'].with_context(active_test=False).search([('id', '=', visitor_anonymous.id)])
-        self.assertFalse(visitor_anonymous)
+        self.assertVisitorDeactivated(visitor_anonymous, visitor_admin)
         new_visitors = self.env['website.visitor'].search([('id', 'not in', existing_visitors.ids)])
         self.assertEqual(new_visitors, visitor_admin | visitor_portal)
         visitor_admin = self.env['website.visitor'].search([('partner_id', '=', self.partner_admin.id)])
@@ -300,6 +317,7 @@ class WebsiteVisitorTests(MockVisitor, HttpCaseWithUserDemo):
         with self.mock_visitor_from_request(force_visitor=new_visitor):
             self.authenticate('demo', 'demo')
         (new_visitor | old_visitor).flush()
+        partner_demo.flush()
         partner_demo.invalidate_cache(fnames=['visitor_ids'])
         self.assertEqual(partner_demo.visitor_ids, old_visitor, "The partner visitor should be back to the 'old' visitor.")
 
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index fe953bf8917..e814ea851b5 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -36,7 +36,7 @@ class WebsiteEventController(http.Controller):
         searches.setdefault('country', 'all')
 
         website = request.website
-        today = datetime.today()
+        today = fields.Datetime.today()
 
         def sdn(date):
             return fields.Datetime.to_string(date.replace(hour=23, minute=59, second=59))
diff --git a/addons/website_event_meet/__init__.py b/addons/website_event_meet/__init__.py
new file mode 100644
index 00000000000..7d34c7c054a
--- /dev/null
+++ b/addons/website_event_meet/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
+from . import models
diff --git a/addons/website_event_meet/__manifest__.py b/addons/website_event_meet/__manifest__.py
new file mode 100644
index 00000000000..ee97ff02819
--- /dev/null
+++ b/addons/website_event_meet/__manifest__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Event Meeting / Rooms',
+    'category': 'Marketing/Events',
+    'sequence': 1002,
+    'version': '1.0',
+    'summary': 'Event: meeting and chat rooms',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        # STD-TODO: remove 'website_event_track_online' we just need it to be
+        # able to use 'website.event.menu' which is defined in 'website_event_track'
+        # as well as even form view defined in track_online
+        'website_event_online',
+        'website_event_track_online',
+        'website_jitsi',
+    ],
+    'demo': ['data/website_event_meet_demo.xml'],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/security.xml',
+        'views/assets.xml',
+        'views/event_meet_templates_list.xml',
+        'views/event_meet_templates_page.xml',
+        'views/event_meeting_room_views.xml',
+        'views/event_event_views.xml',
+        'views/event_type_views.xml',
+    ],
+    'application': False,
+    'installable': True,
+}
diff --git a/addons/website_event_meet/controllers/__init__.py b/addons/website_event_meet/controllers/__init__.py
new file mode 100644
index 00000000000..e6526380f26
--- /dev/null
+++ b/addons/website_event_meet/controllers/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import community
+from . import website_event_main
diff --git a/addons/website_event_meet/controllers/community.py b/addons/website_event_meet/controllers/community.py
new file mode 100644
index 00000000000..c653b9fa9f9
--- /dev/null
+++ b/addons/website_event_meet/controllers/community.py
@@ -0,0 +1,162 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import logging
+from werkzeug.exceptions import Forbidden, NotFound
+from werkzeug.utils import redirect
+
+from odoo import exceptions, http
+from odoo.http import request
+from odoo.addons.http_routing.models.ir_http import slug
+from odoo.addons.website_event_track_online.controllers.community import WebsiteEventCommunityController
+from odoo.osv import expression
+
+_logger = logging.getLogger(__name__)
+
+
+class WebsiteEventMeetController(WebsiteEventCommunityController):
+
+    def _get_event_rooms_base_domain(self, event):
+        search_domain_base = [('event_id', '=', event.id), ('is_published', '=', True)]
+        return search_domain_base
+
+    def _sort_event_rooms(self, room):
+        return (room.is_pinned, room.room_last_activity, room.id)
+
+    # ------------------------------------------------------------
+    # MAIN PAGE
+    # ------------------------------------------------------------
+
+    @http.route(["/event/<model('event.event'):event>/community"], type="http",
+                auth="public", website=True, sitemap=True)
+    def community(self, event, page=1, lang=None, **kwargs):
+        """Display the meeting rooms of the event on the frontend side.
+
+        :param event: event for which we display the meeting rooms
+        :param lang: lang id used to perform a search
+        """
+        if not event.can_access_from_current_website():
+            raise Forbidden()
+
+        return request.render(
+            "website_event_meet.event_meet",
+            self._event_meeting_rooms_get_values(event, lang=lang)
+        )
+
+    def _event_meeting_rooms_get_values(self, event, lang=None):
+        search_domain = self._get_event_rooms_base_domain(event)
+        meeting_rooms_all = request.env['event.meeting.room'].sudo().search(search_domain)
+        if lang:
+            search_domain = expression.AND([
+                search_domain,
+                [('room_lang_id', '=', int(lang))]
+            ])
+        meeting_rooms = request.env['event.meeting.room'].sudo().search(search_domain)
+        meeting_rooms = meeting_rooms.sorted(self._sort_event_rooms, reverse=True)
+
+        is_event_manager = request.env.user.has_group("event.group_event_manager")
+        if not is_event_manager:
+            meeting_rooms = meeting_rooms.filtered(lambda m: not m.room_is_full)
+
+        visitor = request.env['website.visitor']._get_visitor_from_request()
+
+        return {
+            # event information
+            "event": event.sudo(),
+            'main_object': event,
+            # rooms
+            "meeting_rooms": meeting_rooms,
+            "current_lang": request.env["res.lang"].browse(int(lang)) if lang else False,
+            "available_languages": meeting_rooms_all.mapped("room_lang_id"),
+            "default_lang_code": request.context.get('lang', request.env.user.lang),
+            "default_username": visitor.display_name if visitor else None,
+            # environment
+            "is_event_manager": is_event_manager,
+        }
+
+    @http.route("/event/<model('event.event'):event>/meeting_room_create",
+                type="http", auth="public", methods=["POST"], website=True)
+    def create_meeting_room(self, event, **post):
+        if not event or not event.can_access_from_current_website() or not event.is_published or not event.meeting_room_allow_creation:
+            raise Forbidden()
+
+        name = post.get("name")
+        summary = post.get("summary")
+        target_audience = post.get("audience")
+        lang_code = post.get("lang_code")
+        max_capacity = post.get("capacity")
+
+        # get the record to be sure they really exist
+        lang = request.env["res.lang"].search([("code", "=", lang_code)], limit=1)
+
+        if not lang or max_capacity == "no_limit":
+            raise Forbidden()
+
+        meeting_room = request.env["event.meeting.room"].sudo().create({
+            "name": name,
+            "summary": summary,
+            "target_audience": target_audience,
+            "is_pinned": False,
+            "event_id": event.id,
+            "room_lang_id": lang.id,
+            "room_max_capacity": max_capacity,
+            "is_published": True,
+        })
+        _logger.info("New meeting room (%s) created by %s (uid %s)" % (name, request.httprequest.remote_addr, request.env.uid))
+
+        return redirect(f"/event/{slug(event)}/meeting_room/{slug(meeting_room)}")
+
+    @http.route(["/event/active_langs"], type="json", auth="public")
+    def active_langs(self):
+        return request.env["res.lang"].sudo().get_installed()
+
+    # ------------------------------------------------------------
+    # ROOM PAGE VIEW
+    # ------------------------------------------------------------
+
+    @http.route("/event/<model('event.event'):event>/meeting_room/<model('event.meeting.room'):meeting_room>",
+                type="http", auth="public", website=True, sitemap=True)
+    def event_meeting_room_page(self, event, meeting_room, **post):
+        """Display the meeting room frontend view.
+
+        :param event: Event for which we display the meeting rooms
+        :param meeting_room: Meeting Room to display
+        """
+        if not event.can_access_from_current_website() or meeting_room not in event.sudo().meeting_room_ids:
+            raise NotFound()
+
+        try:
+            meeting_room.check_access_rule('read')
+        except exceptions.AccessError:
+            raise Forbidden()
+
+        meeting_room = meeting_room.sudo()
+
+        return request.render(
+            "website_event_meet.event_meet_main",
+            self._event_meeting_room_page_get_values(event, meeting_room),
+        )
+
+    def _event_meeting_room_page_get_values(self, event, meeting_room):
+        # search for meeting room list
+        meeting_rooms_other = request.env['event.meeting.room'].sudo().search([
+            ('event_id', '=', event.id), ('id', '!=', meeting_room.id), ('is_published', '=', True),
+        ])
+
+        if not request.env.user.has_group("event.group_event_manager"):
+            # only the event manager can see meeting rooms which are full
+            meeting_rooms_other = meeting_rooms_other.filtered(lambda m: not m.room_is_full)
+
+        meeting_rooms_other = meeting_rooms_other.sorted(self._sort_event_rooms, reverse=True)
+
+        return {
+            # event information
+            'event': event,
+            'main_object': meeting_room,
+            'meeting_room': meeting_room,
+            # sidebar
+            'meeting_rooms_other': meeting_rooms_other,
+            # options
+            'option_widescreen': True,
+            'is_event_manager': request.env.user.has_group('event.group_event_manager'),
+        }
diff --git a/addons/website_event_meet/controllers/website_event_main.py b/addons/website_event_meet/controllers/website_event_main.py
new file mode 100644
index 00000000000..f395ca09e3f
--- /dev/null
+++ b/addons/website_event_meet/controllers/website_event_main.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from babel.dates import format_datetime
+
+from odoo import _
+from odoo.http import request
+from odoo.addons.website_event.controllers.main import WebsiteEventController
+
+
+class WebsiteEventController(WebsiteEventController):
+    def _prepare_event_register_values(self, event, **post):
+        values = super(WebsiteEventController, self)._prepare_event_register_values(event, **post)
+
+        if "from_room_id" in post and not event.is_ongoing:
+            meeting_room = request.env["event.meeting.room"].browse(int(post["from_room_id"])).sudo().exists()
+            if meeting_room and meeting_room.is_published:
+                date_begin = format_datetime(event.with_context(tz=event.date_tz).date_begin, format="medium")
+
+                values["toast_message"] = (
+                    _('The event %s starts at %s (%s). \nJoin us there to chat about "%s" !')
+                    % (event.name, date_begin, event.date_tz, meeting_room.name)
+                )
+
+        return values
diff --git a/addons/website_event_meet/data/website_event_meet_demo.xml b/addons/website_event_meet/data/website_event_meet_demo.xml
new file mode 100644
index 00000000000..b492f898263
--- /dev/null
+++ b/addons/website_event_meet/data/website_event_meet_demo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="event_meeting_room_0" model="event.meeting.room">
+            <field name="name">Best wood for furniture</field>
+            <field name="summary">Let's talk about wood types for furniture</field>
+            <field name="target_audience">wood expert(s)</field>
+            <field name="is_pinned" eval="True"/>
+            <field name="website_published" eval="True"/>
+            <field name="event_id" ref="event.event_7"/>
+            <field name="room_lang_id" ref="base.lang_en"/>
+            <field name="room_max_capacity">12</field>
+            <field name="room_participant_count">9</field>
+        </record>
+        <record id="event_meeting_room_1" model="event.meeting.room">
+            <field name="name">Reducing the ecological footprint with wood ?</field>
+            <field name="summary">Share your tips to reduce your ecological footprint using wood.</field>
+            <field name="target_audience">ecologist(s)</field>
+            <field name="is_pinned" eval="True"/>
+            <field name="website_published" eval="True"/>
+            <field name="event_id" ref="event.event_7"/>
+            <field name="room_lang_id" ref="base.lang_en"/>
+            <field name="room_max_capacity">8</field>
+            <field name="room_participant_count">8</field>
+        </record>
+        <record id="event_meeting_room_2" model="event.meeting.room">
+            <field name="name">Vos meubles préférés ?</field>
+            <field name="summary">Venez partager vos meubles préférés et l'utilisation que vous en faites.</field>
+            <field name="target_audience">client(s)</field>
+            <field name="is_pinned" eval="True"/>
+            <field name="website_published" eval="True"/>
+            <field name="event_id" ref="event.event_7"/>
+            <field name="room_lang_id" ref="base.lang_fr"/>
+            <field name="room_max_capacity">8</field>
+            <field name="room_participant_count">3</field>
+        </record>
+        <record id="event.event_7" model="event.event">
+            <field name="meeting_room_allow_creation" eval="True"/>
+            <field name="community_menu" eval="True"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/website_event_meet/models/__init__.py b/addons/website_event_meet/models/__init__.py
new file mode 100644
index 00000000000..8f975bbef96
--- /dev/null
+++ b/addons/website_event_meet/models/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_event
+from . import event_type
+from . import event_meeting_room
+from . import ir_autovacuum
+from . import website_event_menu
diff --git a/addons/website_event_meet/models/event_event.py b/addons/website_event_meet/models/event_event.py
new file mode 100644
index 00000000000..4b254e91dbb
--- /dev/null
+++ b/addons/website_event_meet/models/event_event.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.addons.http_routing.models.ir_http import slug
+
+
+class Event(models.Model):
+    _inherit = "event.event"
+
+    meeting_room_ids = fields.One2many("event.meeting.room", "event_id", string="Meeting rooms")
+    meeting_room_count = fields.Integer("Room count", compute="_compute_meeting_room_count")
+    meeting_room_allow_creation = fields.Boolean(
+        "Allow Room Creation", compute="_compute_meeting_room_allow_creation",
+        readonly=False, store=True,
+        help="Let Visitors Create Rooms")
+
+    @api.depends("meeting_room_ids")
+    def _compute_meeting_room_count(self):
+        meeting_room_count = self.env["event.meeting.room"].sudo().read_group(
+            domain=[("event_id", "in", self.ids)],
+            fields=["id:count"],
+            groupby=["event_id"],
+        )
+
+        meeting_room_count = {
+            result["event_id"][0]: result["event_id_count"]
+            for result in meeting_room_count
+        }
+
+        for event in self:
+            event.meeting_room_count = meeting_room_count.get(event.id, 0)
+
+    @api.depends("event_type_id", "community_menu", "meeting_room_allow_creation")
+    def _compute_meeting_room_allow_creation(self):
+        for event in self:
+            if event.event_type_id and event.event_type_id != event._origin.event_type_id:
+                event.meeting_room_allow_creation = event.event_type_id.meeting_room_allow_creation
+            elif event.community_menu and event.community_menu != event._origin.community_menu:
+                event.meeting_room_allow_creation = True
+            elif not event.community_menu or not event.meeting_room_allow_creation:
+                event.meeting_room_allow_creation = False
diff --git a/addons/website_event_meet/models/event_meeting_room.py b/addons/website_event_meet/models/event_meeting_room.py
new file mode 100644
index 00000000000..cad8bc78936
--- /dev/null
+++ b/addons/website_event_meet/models/event_meeting_room.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from werkzeug.urls import url_join
+
+from odoo import api, fields, models, _
+from odoo.addons.http_routing.models.ir_http import slug
+
+
+class EventMeetingRoom(models.Model):
+    _name = "event.meeting.room"
+    _description = "Event Meeting Room"
+    _order = "is_pinned DESC, id"
+    _inherit = [
+        'chat.room.mixin',
+        'website.published.mixin',
+    ]
+
+    name = fields.Char("Topic", required=True, translate=True)
+    active = fields.Boolean('Active', default=True)
+    is_published = fields.Boolean(copy=True)  # make the inherited field copyable
+    event_id = fields.Many2one("event.event", string="Event", required=True, ondelete="cascade")
+    is_pinned = fields.Boolean("Is Pinned")
+    summary = fields.Char("Summary")
+    target_audience = fields.Char("Audience", translate=True)
+
+    # TDE FIXME: merge with mixin code
+    ROOM_CONFIG_FIELDS = {
+        'room_name': 'name',
+        'room_lang_id': 'lang_id',
+        'room_max_capacity': 'max_capacity',
+        'room_participant_count': 'participant_count',
+    }
+
+    @api.depends('name', 'event_id.name')
+    def _compute_website_url(self):
+        super(EventMeetingRoom, self)._compute_website_url()
+        for meeting_room in self:
+            if meeting_room.id:
+                base_url = meeting_room.event_id.get_base_url()
+                meeting_room.website_url = '%s/event/%s/meeting_room/%s' % (base_url, slug(meeting_room.event_id), slug(meeting_room))
+
+    @api.model_create_multi
+    def create(self, values_list):
+        # TDE FIXME: merge with mixin code
+        for values in values_list:
+            if not values.get("chat_room_id"):
+                # be sure to always create a `chat.room` for each `event.meeting.room`
+                chat_room = self.env["chat.room"].create({
+                    self.ROOM_CONFIG_FIELDS[field]: value
+                    for field, value in dict(values).items()
+                    if field in self.ROOM_CONFIG_FIELDS and values.pop(field)
+                })
+
+                values["chat_room_id"] = chat_room.id
+
+            values["name"] = values["name"].capitalize()
+            values["target_audience"] = (values.get("target_audience") or _("Attendee(s)")).capitalize()
+
+        return super(EventMeetingRoom, self).create(values_list)
diff --git a/addons/website_event_meet/models/event_type.py b/addons/website_event_meet/models/event_type.py
new file mode 100644
index 00000000000..4272de467b4
--- /dev/null
+++ b/addons/website_event_meet/models/event_type.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class EventType(models.Model):
+    _inherit = "event.type"
+
+    meeting_room_allow_creation = fields.Boolean(
+        "Allow Room Creation", compute='_compute_meeting_room_allow_creation',
+        readonly=False, store=True,
+        help="Let Visitors Create Rooms")
+
+    @api.depends('community_menu')
+    def _compute_meeting_room_allow_creation(self):
+        for event_type in self:
+            event_type.meeting_room_allow_creation = event_type.community_menu
diff --git a/addons/website_event_meet/models/ir_autovacuum.py b/addons/website_event_meet/models/ir_autovacuum.py
new file mode 100644
index 00000000000..11907a0d5ac
--- /dev/null
+++ b/addons/website_event_meet/models/ir_autovacuum.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import datetime
+
+from odoo import api, models, fields
+
+
+class AutoVacuum(models.AbstractModel):
+    _inherit = 'ir.autovacuum'
+
+    _DELAY_CLEAN = datetime.timedelta(hours=4)
+
+    @api.model
+    def power_on(self, *args, **kwargs):
+        """Archive all non-pinned room with 0 participant if nobody has joined it for a moment."""
+        self.env["event.meeting.room"].sudo().search([
+            ("is_pinned", "=", False),
+            ("active", "=", True),
+            ("room_participant_count", "=", 0),
+            ("room_last_activity", "<", fields.Datetime.now() - self._DELAY_CLEAN),
+        ]).active = False
+
+        return super(AutoVacuum, self).power_on(*args, **kwargs)
diff --git a/addons/website_event_meet/models/website_event_menu.py b/addons/website_event_meet/models/website_event_menu.py
new file mode 100644
index 00000000000..827d3bc1fa4
--- /dev/null
+++ b/addons/website_event_meet/models/website_event_menu.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class EventMenu(models.Model):
+    _inherit = "website.event.menu"
+
+    menu_type = fields.Selection(selection_add=[("meeting_room", "Event Meeting Room Menus")])
diff --git a/addons/website_event_meet/security/ir.model.access.csv b/addons/website_event_meet/security/ir.model.access.csv
new file mode 100644
index 00000000000..eeae56fb6a0
--- /dev/null
+++ b/addons/website_event_meet/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+event_meeting_room_access_all,event.meeting.room.access.all,model_event_meeting_room,,1,0,0,0
+event_meeting_room_access_user,event.meeting.room.access.user,model_event_meeting_room,event.group_event_user,1,0,0,0
+event_meeting_room_access_manager,event.meeting.room.access.manager,model_event_meeting_room,event.group_event_manager,1,1,1,1
+chat_room_access_event_user,chat.room.access.event.user,website_jitsi.model_chat_room,event.group_event_user,1,0,0,0
+chat_room_access_event_manager,chat.room.access.event.manager,website_jitsi.model_chat_room,event.group_event_manager,1,1,1,1
diff --git a/addons/website_event_meet/security/security.xml b/addons/website_event_meet/security/security.xml
new file mode 100644
index 00000000000..e4680042533
--- /dev/null
+++ b/addons/website_event_meet/security/security.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="event_meeting_room_rule_share" model="ir.rule">
+        <field name="name">Event Meeting Room: public/portal published only</field>
+        <field name="model_id" ref="website_event_meet.model_event_meeting_room"/>
+        <field name="domain_force">[('website_published', '=', True)]</field>
+        <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="False"/>
+        <field name="perm_create" eval="False"/>
+        <field name="perm_unlink" eval="False"/>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_meet/static/src/js/customize_options.js b/addons/website_event_meet/static/src/js/customize_options.js
new file mode 100644
index 00000000000..4d8ccbd3ab7
--- /dev/null
+++ b/addons/website_event_meet/static/src/js/customize_options.js
@@ -0,0 +1,69 @@
+odoo.define('website_event_meet.set_customize_options', function (require) {
+"use strict";
+
+let EventSpecificOptions = require('website_event.set_customize_options').EventSpecificOptions;
+
+EventSpecificOptions.include({
+    xmlDependencies: (EventSpecificOptions.prototype.xmlDependencies || [])
+        .concat([
+            '/website_event_meet/static/src/xml/customize_options.xml',
+        ]),
+
+    events: _.extend({}, EventSpecificOptions.prototype.events, {
+        'change #allow-room-creation': '_onAllowRoomCreationChange',
+    }),
+
+    start: function () {
+        this.$allowRoomCreationInput = this.$('#allow-room-creation');
+        this._super.apply(this, arguments);
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    _onAllowRoomCreationChange: function () {
+        let checkboxValue = this.$allowRoomCreationInput.is(':checked');
+        this._toggleAllowRoomCreation(checkboxValue);
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _getCheckboxFields: function () {
+        let fields = this._super();
+        fields = _.union(fields, ['meeting_room_allow_creation']);
+        return fields;
+    },
+
+    _getCheckboxFieldMatch: function (checkboxField) {
+        if (checkboxField === 'meeting_room_allow_creation') {
+            return this.$allowRoomCreationInput;
+        }
+        return this._super(checkboxField);
+    },
+
+    _initCheckboxCallback: function (rpcData) {
+        this._super(rpcData);
+        if (rpcData[0]['meeting_room_allow_creation']) {
+            let submenuInput = this._getCheckboxFieldMatch('meeting_room_allow_creation');
+            submenuInput.attr('checked', 'checked');
+        }
+    },
+
+    _toggleAllowRoomCreation: async function (val) {
+        await this._rpc({
+            model: this.modelName,
+            method: 'write',
+            args: [[this.eventId], {
+                meeting_room_allow_creation: val
+            }],
+        });
+
+        this._reloadEventPage();
+    },
+
+});
+
+});
diff --git a/addons/website_event_meet/static/src/js/website_event_create_meeting_room_button.js b/addons/website_event_meet/static/src/js/website_event_create_meeting_room_button.js
new file mode 100644
index 00000000000..c64537a57a7
--- /dev/null
+++ b/addons/website_event_meet/static/src/js/website_event_create_meeting_room_button.js
@@ -0,0 +1,59 @@
+odoo.define('website_event_meet.website_event_create_room_button', function (require) {
+'use strict';
+
+const publicWidget = require('web.public.widget');
+const core = require('web.core');
+const QWeb = core.qweb;
+
+publicWidget.registry.websiteEventCreateMeetingRoom = publicWidget.Widget.extend({
+    selector: '.o_wevent_create_room_button',
+    xmlDependencies: ['/website_event_meet/static/src/xml/website_event_meeting_room.xml'],
+    events: {
+        'click': '_onClickCreate',
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    _onClickCreate: async function () {
+        if (!this.$createModal) {
+            const langs = await this._rpc({
+                route: "/event/active_langs",
+            });
+
+            this.$createModal = $(QWeb.render(
+                'event_meet_create_room_modal',
+                {
+                    csrf_token: odoo.csrf_token,
+                    eventId: this.$el.data("eventId"),
+                    defaultLangCode: this.$el.data("defaultLangCode"),
+                    langs: langs,
+                }
+            ));
+
+            this.$createModal.appendTo(this.$el.parentNode);
+        }
+
+        this.$createModal.modal('show');
+    },
+
+    //--------------------------------------------------------------------------
+    // Override
+    //--------------------------------------------------------------------------
+
+    /**
+     * Remove the create modal from the DOM, to avoid issue when editing the template
+     * with the website editor.
+     *
+     * @override
+     */
+    destroy: function () {
+        $('.o_wevent_create_meeting_room_modal').remove();
+        this._super.apply(this, arguments);
+    },
+});
+
+return publicWidget.registry.websiteEventMeetingRoom;
+
+});
diff --git a/addons/website_event_meet/static/src/js/website_event_meeting_room.js b/addons/website_event_meet/static/src/js/website_event_meeting_room.js
new file mode 100644
index 00000000000..774a186e9f7
--- /dev/null
+++ b/addons/website_event_meet/static/src/js/website_event_meeting_room.js
@@ -0,0 +1,111 @@
+odoo.define('website_event_meet.website_event_meet_meeting_room', function (require) {
+'use strict';
+
+const publicWidget = require('web.public.widget');
+const core = require('web.core');
+const Dialog = require('web.Dialog');
+const _t = core._t;
+
+publicWidget.registry.websiteEventMeetingRoom = publicWidget.Widget.extend({
+    selector: '.o_wevent_meeting_room_card',
+    xmlDependencies: ['/website_event_meet/static/src/xml/website_event_meeting_room.xml'],
+    events: {
+        'click .o_wevent_meeting_room_delete': '_onDeleteClick',
+        'click .o_wevent_meeting_room_duplicate': '_onDuplicateClick',
+        'click .o_wevent_meeting_room_is_pinned': '_onPinClick',
+    },
+
+    start: function () {
+        this._super.apply(this, arguments);
+        this.meetingRoomId = parseInt(this.$el.data('meeting-room-id'));
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+      * Delete the meeting room.
+      *
+      * @private
+      */
+    _onDeleteClick: async function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        Dialog.confirm(
+            this,
+            _t("Are you sure you want to close this room ?"),
+            {
+                confirm_callback: async () => {
+                    await this._rpc({
+                        model: 'event.meeting.room',
+                        method: 'write',
+                        args: [this.meetingRoomId, {is_published: false}],
+                        context: this.context,
+                    });
+
+                    // remove the element so we do not need to refresh the page
+                    this.$el.remove();
+                }
+            },
+        );
+    },
+
+    /**
+      * Duplicate the room.
+      *
+      * @private
+      */
+    _onDuplicateClick: function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+        Dialog.confirm(
+            this,
+            _t("Are you sure you want to duplicate this room ?"),
+            {
+                confirm_callback: async () => {
+                    await this._rpc({
+                        model: 'event.meeting.room',
+                        method: 'copy',
+                        args: [this.meetingRoomId],
+                        context: this.context,
+                    });
+
+                    window.location.reload();
+                }
+            },
+        );
+    },
+
+    /**
+      * Pin/unpin the room.
+      *
+      * @private
+      */
+    _onPinClick: async function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        const pinnedButtonClass = "o_wevent_meeting_room_pinned";
+        const isPinned = event.currentTarget.classList.contains(pinnedButtonClass);
+
+        await this._rpc({
+            model: 'event.meeting.room',
+            method: 'write',
+            args: [this.meetingRoomId, {is_pinned: !isPinned}],
+            context: this.context,
+        });
+
+        // TDE FIXME: addclass ?
+        if (isPinned) {
+            event.currentTarget.classList.remove(pinnedButtonClass);
+        } else {
+            event.currentTarget.classList.add(pinnedButtonClass);
+        }
+    }
+});
+
+return publicWidget.registry.websiteEventMeetingRoom;
+
+});
diff --git a/addons/website_event_meet/static/src/scss/event_meet_templates.scss b/addons/website_event_meet/static/src/scss/event_meet_templates.scss
new file mode 100644
index 00000000000..ddd9e030f3c
--- /dev/null
+++ b/addons/website_event_meet/static/src/scss/event_meet_templates.scss
@@ -0,0 +1,59 @@
+.o_wemeet_index {
+
+    /*
+     * COMMON
+     */
+
+    /*
+     * Meet Room PAGE
+     */
+
+    .o_wevent_online_page_container {
+
+        // Jitsi container
+        #o_wemeet_jitsi_iframe {
+            height: 85vh;
+        }
+    }
+}
+
+/*
+ * MEETING MODAL (JS / XML WIDGET)
+ */
+
+.o_wevent_create_meeting_room_modal .modal-dialog {
+    top: 25%;
+    max-width: 500px;
+    height: auto;
+}
+
+/* TDE FIXME: reorganize css cleanly */
+.o_wevent_meeting_room_is_pinned {
+    transition: 0.2s;
+
+    // the icon must be filled with white when the meeting room is not pinned
+    color: white;
+    -webkit-text-stroke: 1px $o-main-text-color;
+    -webkit-text-fill-color: transparent;
+
+    &.o_wevent_meeting_room_pinned {
+        // the icon must be filled with black when the meeting room is pinned
+        -webkit-text-fill-color: $o-main-text-color;
+    }
+}
+
+.o_wevent_meeting_room_corner_ribbon {
+    width: 200px;
+    background: #e43;
+    top: 25px;
+    left: -50px;
+    text-align: center;
+    line-height: 50px;
+    letter-spacing: 1px;
+    color: #f0f0f0;
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg);
+    z-index: 1;
+    position: absolute;
+    opacity: 0.6;
+}
diff --git a/addons/website_event_meet/static/src/xml/customize_options.xml b/addons/website_event_meet/static/src/xml/customize_options.xml
new file mode 100644
index 00000000000..7be9b617bc9
--- /dev/null
+++ b/addons/website_event_meet/static/src/xml/customize_options.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+    <t t-extend="website_event.customize_options">
+        <t t-jquery="a[name='display-website-menu']" t-operation="after">
+            <a t-if="window.document.location.pathname.endsWith('/community')" class="dropdown-item" href="#" name="allow-room-creation" role="menuitem">
+                <label class="o_switch" for="allow-room-creation">
+                    <input id="allow-room-creation" type="checkbox"/>
+                    <span/>
+                    Allow Room Creation
+                </label>
+            </a>
+        </t>
+    </t>
+</templates>
diff --git a/addons/website_event_meet/static/src/xml/website_event_meeting_room.xml b/addons/website_event_meet/static/src/xml/website_event_meeting_room.xml
new file mode 100644
index 00000000000..bb08735c4ee
--- /dev/null
+++ b/addons/website_event_meet/static/src/xml/website_event_meeting_room.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+    <t t-name="event_meet_create_room_modal">
+        <div class="modal fade o_wevent_create_meeting_room_modal" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content border-0">
+                    <main class="modal-body p-3">
+                        <form t-attf-action="/event/#{eventId}/meeting_room_create"
+                            id="o_wevent_create_meeting_room_form"
+                            class="text-dark"
+                            method="POST">
+                            <h2>Launch a new topic</h2>
+                            <div class="row m-2">
+                                <label class="col-4 mt-2 text-left">Room Topic</label>
+                                <input class="form-control col-8" maxlength="50" name="name" placeholder="e.g. Finance" required="1"/>
+                            </div>
+                            <div class="row m-2">
+                                <label class="col-4 mt-2 text-left">Short Summary</label>
+                                <input class="form-control col-8" maxlength="200" name="summary" placeholder="e.g. Let's talk about Corporate Finance" required="1"/>
+                            </div>
+                            <div class="row m-2">
+                                <label class="col-4 mt-2 text-left">Target People</label>
+                                <input class="form-control col-8" maxlength="30" name="audience" placeholder="e.g. Accountants"/>
+                            </div>
+                            <div class="row m-2">
+                                <label class="col-4 mt-2 text-left">Language</label>
+                                <select class="o_wevent_create_meeting_room_lang form-control col-8" name="lang_code" required="1">
+                                    <option t-foreach="langs" t-as="language" t-att-value="language[0]" t-esc="language[1]"
+                                        t-att-selected="language[0] == defaultLangCode and 'selected' or None"/>
+                                </select>
+                            </div>
+                            <div class="row m-2">
+                                <label class="col-4 mt-2 text-left">Capacity</label>
+                                <select class="form-control col-8" name="capacity" required="1">
+                                    <option value="4">4</option>
+                                    <option selected="selected" value="8">8</option>
+                                    <option value="12">12</option>
+                                    <option value="16">16</option>
+                                    <option value="20">20</option>
+                                </select>
+                            </div>
+                            <input name="event" t-att-value="event" type="hidden"/>
+                            <input name="csrf_token" t-att-value="csrf_token" type="hidden"/>
+                        </form>
+                    </main>
+                    <footer class="modal-footer justify-content-start">
+                        <button class="btn btn-primary" form="o_wevent_create_meeting_room_form" type="submit">Create</button>
+                        <button class="btn bg-white text-primary" role="button" data-dismiss="modal">Discard</button>
+                    </footer>
+                </div>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/addons/website_event_meet/tests/__init__.py b/addons/website_event_meet/tests/__init__.py
new file mode 100644
index 00000000000..b2835ad5a69
--- /dev/null
+++ b/addons/website_event_meet/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_website_event_meet
diff --git a/addons/website_event_meet/tests/test_website_event_meet.py b/addons/website_event_meet/tests/test_website_event_meet.py
new file mode 100644
index 00000000000..becb51e85bf
--- /dev/null
+++ b/addons/website_event_meet/tests/test_website_event_meet.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.event.tests.common import TestEventCommon
+from odoo.tests import Form
+
+
+class TestWebsiteEventMeet(TestEventCommon):
+    def test_meeting_room_create(self):
+        """Test that the field of the mixin are automatically filled."""
+        new_meeting_room_form = Form(self.env["event.meeting.room"])
+        new_meeting_room_form.name = "Test name"
+        new_meeting_room_form.event_id = self.event_0
+        new_meeting_room_form.target_audience = "dev"
+        new_meeting_room_form.room_max_capacity = "20"
+        meeting_room = new_meeting_room_form.save()
+
+        self.assertTrue(meeting_room.chat_room_id)
+        self.assertEqual(meeting_room.chat_room_id.max_capacity, "20")
+
+        # Try to create a meeting room without filling the related field
+        # It must create the `chat.room` with the default value
+        meeting_room = self.env["event.meeting.room"].create({
+            "name": "Test 2",
+            "event_id": self.event_0.id,
+            "target_audience": "dev"
+        })
+
+        self.assertTrue(meeting_room.chat_room_id)
+        self.assertTrue(meeting_room.chat_room_id.name)
+        self.assertEqual(meeting_room.chat_room_id.max_capacity, "8")
+
+    def test_meeting_room_copy(self):
+        """Test the duplication of the meeting room."""
+        meeting_room_1 = self.env["event.meeting.room"].create({
+            "name": "Test meeting room",
+            "event_id": self.event_0.id,
+            "target_audience": "dev",
+            "room_max_capacity": "20",
+        })
+
+        meeting_room_2 = meeting_room_1.copy()
+
+        chat_room_1 = meeting_room_1.chat_room_id
+        chat_room_2 = meeting_room_2.chat_room_id
+
+        self.assertTrue(chat_room_1)
+        self.assertTrue(chat_room_2)
+        self.assertNotEqual(chat_room_1.id, chat_room_2.id, "Must create a new chat room")
+        self.assertNotEqual(chat_room_1.name, chat_room_2.name, "Must generate a new chat room name")
+        self.assertEqual(chat_room_1.max_capacity, "20", "Must set the max capacity on the chat room")
+        self.assertEqual(chat_room_2.max_capacity, "20", "Must copy the max capacity")
+
+    def test_meeting_room_unlink(self):
+        """Test the duplication of the meeting room."""
+        meeting_room = self.env["event.meeting.room"].create({
+            "name": "Test meeting room",
+            "event_id": self.event_0.id,
+            "target_audience": "dev",
+            "room_max_capacity": "20",
+        })
+
+        self.assertTrue(meeting_room.chat_room_id)
+        chat_room_id = meeting_room.chat_room_id.id
+
+        meeting_room.unlink()
+        self.assertFalse(self.env["chat.room"].browse(chat_room_id).exists())
diff --git a/addons/website_event_meet/views/assets.xml b/addons/website_event_meet/views/assets.xml
new file mode 100644
index 00000000000..0d57557fb4d
--- /dev/null
+++ b/addons/website_event_meet/views/assets.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Meet Assets">
+        <xpath expr="." position="inside">
+            <link href="/website_event_meet/static/src/scss/event_meet_templates.scss" rel="stylesheet" type="text/scss"/>
+            <script src="/website_event_meet/static/src/js/customize_options.js" type="text/javascript"/>
+            <script src="/website_event_meet/static/src/js/website_event_meeting_room.js" type="text/javascript"/>
+            <script src="/website_event_meet/static/src/js/website_event_create_meeting_room_button.js" type="text/javascript"/>
+        </xpath>
+    </template>
+</odoo>
diff --git a/addons/website_event_meet/views/event_event_views.xml b/addons/website_event_meet/views/event_event_views.xml
new file mode 100644
index 00000000000..08d5c46e86b
--- /dev/null
+++ b/addons/website_event_meet/views/event_event_views.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="event_event_view_form" model="ir.ui.view">
+        <field name="name">event.event.view.form.inherit.meet</field>
+        <field name="model">event.event</field>
+        <field name="inherit_id" ref="website_event_track_online.event_event_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='is_published']" position="before">
+                <button class="oe_stat_button" context="{'default_event_id': active_id, 'search_default_event_id': active_id}" icon="fa-comments-o" name="%(event_meeting_room_action)d" type="action">
+                    <field name="meeting_room_count" string="Rooms" widget="statinfo"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='community_menu']" position="after">
+                <field name="meeting_room_allow_creation" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
+
diff --git a/addons/website_event_meet/views/event_meet_templates_list.xml b/addons/website_event_meet/views/event_meet_templates_list.xml
new file mode 100644
index 00000000000..85b92c920fe
--- /dev/null
+++ b/addons/website_event_meet/views/event_meet_templates_list.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_meet" name="Meeting Rooms">
+    <t t-call="website_event.layout">
+        <div class="o_wevent_online o_wevent_online_bg o_wemeet_index">
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_website_event_location_1" class="oe_structure"/>
+            <!-- Content -->
+            <div class="o_wemeet_container container">
+                <div class="row mb-5 mx-0">
+                    <t t-call="website_event_meet.community_main"/>
+                    <t t-call="website_event_meet.community_aside"/>
+                </div>
+            </div>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_website_event_location_2" class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+<!-- ============================================================ -->
+<!-- CONTENT: MAIN TEMPLATES -->
+<!-- ============================================================ -->
+
+<!-- Meeting Rooms Main Display -->
+<template id="community_main" name="Meeting Rooms: Main Display">
+    <div class="col-12 col-md-8 pl-0 pr-0 pr-md-3 mt-3">
+        <h1 class="d-flex flex-row justify-content-between">
+            <span>Join a room</span>
+            <div class="dropdown">
+                <a class="dropdown-toggle o-no-caret btn pr-0" title="Languages Menu"
+                    aria-label="Dropdown menu" data-display="static" data-toggle="dropdown" href="#" role="button">
+                    <span t-esc="current_lang.name if current_lang else 'All Languages'"/> ▼</a>
+                <div class="dropdown-menu" role="menu">
+                    <a class="dropdown-item" role="menuitem" t-attf-href="/event/#{slug(event)}/community">All Languages
+                       </a>
+                    <a class="dropdown-item" role="menuitem" t-as="language" t-attf-href="/event/#{slug(event)}/community?lang=#{language.id}" t-esc="language.name" t-foreach="available_languages"/>
+                </div>
+            </div>
+        </h1>
+        <hr class="mt-2 mb-3"/>
+        <p class="mt-">Choose a topic that interests you and start talking with the community. <br/> Don't forget to setup your camera and microphone.</p>
+        <div class="d-flex flex-column justify-content-start align-items-start">
+            <t t-as="meeting_room" t-call="website_event_meet.meeting_room_card" t-foreach="meeting_rooms">
+                <t t-set="meeting_room" t-value="meeting_room"/>
+                <t t-set="opened" t-value="int(meeting_room.id == open_room_id)"/>
+            </t>
+            <div t-if="not meeting_rooms" class="m-auto text-center text-muted">
+                <h3 class="mt8">No Room Open</h3>
+                <p>Create one to get conversations going</p>
+            </div>
+        </div>
+    </div>
+</template>
+
+<template id="meeting_room_card" name="Meeting Room Card">
+    <div class="modal o_join_later_modal" t-attf-id="o_join_later_modal_#{meeting_room.id}" tabindex="-1" role="dialog" style="height: 400px; top:calc(50% - 200px);">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="mt-4 col-12 alert alert-warning text-center" role="alert">
+                    <nav class="navbar navbar-default">
+                        <div class="container-fluid">
+                            <div class="navbar-header">
+                                <div class="o_wevent_meeting_room_card_menu"></div>
+                            </div>
+                        </div>
+                    </nav>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+                    <span>This room is not open right now!</span><br />
+                    Join us here on the
+                    <strong itemprop="startDate" t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'format': 'medium'}"/>
+                    to have a chat with us!
+                </div>
+
+                <div class="modal-body row">
+                    <div class="col-3">
+                        <div class="w-100" t-attf-style="background-image: #{json.loads(event.cover_properties).get('background-image')}; min-height: 5rem; background-size: cover;"/>
+                    </div>
+                    <div class="col">
+                        <h5 t-esc="meeting_room.name"/>
+                        <div class="text-muted mb-2"><i class="fa fa-globe"/> <span t-esc="meeting_room.room_lang_id.name"/></div>
+                        <span t-if="meeting_room.summary" t-raw="meeting_room.summary"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Action to do when clicking on the card -->
+    <t t-if="event.is_ongoing or is_event_manager">
+        <!--During the event or if event manager-->
+        <t t-set="meeting_room_href" t-value="'/event/' + slug(event) + '/meeting_room/' + slug(meeting_room)"/>
+    </t>
+    <t t-elif="not event.is_ongoing and not event.is_participating">
+        <!--Pre-event, if not registered yet-->
+        <t t-set="meeting_room_href" t-value="'/event/' + slug(event) + '/register?from_room_id=%i' % meeting_room.id"/>
+    </t>
+    <t t-else="">
+        <!--Pre-event, if registered but event not stared yet-->
+        <t t-set="meeting_room_href" t-value="'#'"/>
+        <t t-set="meeting_room_data_toggle" t-value="'modal'"/>
+        <t t-set="meeting_room_data_target" t-value="'#o_join_later_modal_%i' % meeting_room.id"/>
+    </t>
+
+    <a t-if="is_event_manager or not meeting_room.room_is_full"
+        t-att-data-meeting-room-id="meeting_room.id"
+        t-att-data-open-room="opened"
+        t-att-data-is-event-manager="int(is_event_manager)"
+        t-attf-class="card o_wevent_meeting_room_card w-100 my-2 bg-light d-block text-decoration-none"
+        t-att-href="meeting_room_href"
+        t-att-data-toggle="meeting_room_data_toggle"
+        t-att-data-target="meeting_room_data_target">
+        <div class="text-decoration-none w-100 h-100 p-3">
+            <div class="o_wevent_meeting_room_corner_ribbon" t-if="meeting_room.room_is_full">Full</div>
+            <div class="d-flex flex-column">
+                <div class="d-flex flex-row justify-content-between">
+                    <h4 class="text-break mw-75" t-esc="meeting_room.name"/>
+                    <div t-if="is_event_manager" class="w-25">
+                        <div class="dropdown float-right dropleft">
+                            <button class="btn py-0" data-toggle="dropdown"><h3 class="m-0">&#8942;</h3></button>
+                            <div class="dropdown-menu">
+                                <div class="dropdown-item font-weight-bold disabled">Room Manager</div>
+                                <button class="dropdown-item btn btn-danger o_wevent_meeting_room_duplicate" type="button">Duplicate</button>
+                                <button class="dropdown-item btn btn-danger o_wevent_meeting_room_delete" type="button">Close</button>
+                            </div>
+                        </div>
+                        <button t-attf-class="o_wevent_meeting_room_is_pinned float-right btn #{'o_wevent_meeting_room_pinned' if meeting_room.is_pinned else ''}">
+                            <i class="fa fa-thumb-tack"/>
+                        </button>
+                    </div>
+                </div>
+                <span t-esc="meeting_room.summary" class="h5 text-muted"/>
+                <div class="d-flex flex-row justify-content-between align-items-center">
+                    <span class="h6 m-0 row">
+                        <span class="o_wevent_participant_count">
+                            <t t-esc="meeting_room.room_participant_count"/>&amp;nbsp;</span>
+                        <t t-esc="meeting_room.target_audience or 'participant(s)'"/>
+                    </span>
+                    <div class="d-inline border py-1 px-2 bg-secondary" t-esc="meeting_room.room_lang_id.name"/>
+                </div>
+            </div>
+        </div>
+    </a>
+</template>
+
+<!-- ============================================================ -->
+<!-- ASIDE: CREATE A ROOM -->
+<!-- ============================================================ -->
+
+<template id="community_aside" name="Community: Aside">
+    <div class="col-md-4 p-0 mt-3 o_wevent_community_aside">
+        <div class="d-none d-md-block mb-3" t-if="event.meeting_room_allow_creation">
+            <h1>Launch a new topic</h1>
+            <hr class="mt-2 mb-3"/>
+            <p>Want to create your own discussion room ?</p>
+            <p>Be sure you are ready to spend at least 10 minutes in the room if you want to initiate a new topic.</p>
+            <a href="#" role="button"  class="btn btn-primary o_wevent_create_room_button"
+                t-att-data-event-id="event.id"
+                t-att-data-default-lang-code="default_lang_code">
+                <span>Create a Room</span>
+            </a>
+        </div>
+    </div>
+</template>
+
+</odoo>
diff --git a/addons/website_event_meet/views/event_meet_templates_page.xml b/addons/website_event_meet/views/event_meet_templates_page.xml
new file mode 100644
index 00000000000..36cecd3e6a9
--- /dev/null
+++ b/addons/website_event_meet/views/event_meet_templates_page.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_meet_main" name="Event Meet">
+    <t t-set="no_header" t-value="option_widescreen"/>
+    <t t-set="no_footer" t-value="option_widescreen"/>
+    <t t-call="website_event.layout">
+        <div class="o_wevent_online o_wevent_online_bg o_wemeet_index">
+            <!-- Options -->
+            <t t-set="option_widescreen" t-value="option_widescreen or False"/>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wemeet_index_1" class="oe_structure"/>
+            <!-- Content -->
+            <div t-att-class="'o_wevent_online_page_container %s' % ('container pb-3' if not option_widescreen else 'pb-3')">
+                <div class="row mb-5 mx-0">
+                    <t t-call="website_event_meet.meeting_room_aside"/>
+                    <t t-call="website_event_meet.meeting_room_main"/>
+                </div>
+            </div>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wemeet_index_2" class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+<!-- ============================================================ -->
+<!-- CONTENT: MAIN TEMPLATES -->
+<!-- ============================================================ -->
+
+<template id="meeting_room_main" name="Meeting Room: Main Content">
+    <div t-att-class="'col-12 o_wevent_online_page_main o_wemeet_room_main bg-white p-0 %s' % ('col-md-9 col-lg-10' if option_widescreen else 'col-md-8 col-lg-9')">
+        <!-- EVENT NOT STARTED ALERTS -->
+        <div t-if="not meeting_room.event_id.is_ongoing" class="alert alert-warning text-center">
+            The event <span t-esc="meeting_room.event_id.name" class="font-weight-bold"/>
+            <span t-if="meeting_room.event_id.start_today">
+                starts in
+                <span t-esc="meeting_room.event_id.start_remaining"
+                    t-options="{'widget': 'duration', 'digital': True, 'unit': 'minute', 'round': 'minute'}"/>.
+            </span>
+            <span class="my-0" t-else="meeting_room.event_id.start_today">
+                starts at
+                <span t-field="meeting_room.event_id.with_context(tz=meeting_room.event_id.date_tz).date_begin"
+                    t-options="{'format': 'medium'}"/> (<t t-esc="meeting_room.event_id.date_tz"/>).
+            </span>
+            <br/>
+            <span>Join us there to chat about "<b t-esc="meeting_room.name"/> !</span>
+        </div>
+        <!-- ROOM CONTENT -->
+        <div class="d-flex flex-column">
+            <div t-if="meeting_room.room_is_full and not is_event_manager" class="alert alert-warning text-center">
+                <span>Oops! This room is full !</span><br />Come back later to have a chat with us!
+            </div>
+            <div t-else="" class="d-flex flex-column">
+                <div id="o_wemeet_jitsi_iframe">
+                    <div class="o_wjitsi_chat_room_loading position-absolute w-100 text-center text-muted">
+                        <i class="fa fa-spin fa-spinner mr-3"/>
+                        <span>Loading your room...</span>
+                    </div>
+                </div>
+                <div class="d-flex flex-row-reverse">
+                    <t t-call="website_jitsi.chat_room_join_button">
+                        <t t-set="_classes" t-value="'d-none'"/>
+                        <t t-set="room_name" t-value="meeting_room.room_name"/>
+                        <t t-set="chat_room_id" t-value="meeting_room.chat_room_id.id"/>
+                        <t t-set="auto_open" t-value="1"/>
+                        <t t-set="attach_to" t-value="'#o_wemeet_jitsi_iframe'"/>
+                        <t t-set="check_full" t-value="is_event_manager"/>
+                        <t t-set="default_username" t-value="default_username"/>
+                    </t>
+                </div>
+            </div>
+        </div>
+        <!-- ROOM DESCRIPTION -->
+        <div class="mx-3">
+            <span class="h5 d-inline-block mt-3 mb-1" t-esc="meeting_room.name"/>
+            <br/>
+            <span class="text-muted">A chat among <span class="font-weight-bold" t-esc="meeting_room.target_audience"/></span>
+        </div>
+        <hr class="mt-2 mb-0"/>
+        <div t-field="meeting_room.summary" class="my-2 mx-3 oe_no_empty"/>
+     </div>
+</template>
+
+<!-- ============================================================ -->
+<!-- ASIDE: CONTROL PANEL -->
+<!-- ============================================================ -->
+
+<template id="meeting_room_aside" name="Meeting Room: Aside">
+    <div t-att-class="'col-12 pl-0 pr-0 pr-md-3 o_wevent_online_page_aside %s' % ('col-md-3 col-lg-2' if option_widescreen else 'col-md-4 col-lg-3')">
+        <div class="bg-white o_wevent_online_page_aside_content">
+            <div class="d-flex align-items-center justify-content-between mx-2 py-1">
+                <span class="h5 mb-0 pt-0 pt-md-3 pb-0 pb-md-2">Other Rooms</span>
+                <a href="#collapse_meet_room_aside" data-toggle="collapse" class="d-lg-none p-2 text-decoration-none o_wevent_online_page_aside_collapse collapsed">
+                    <i class="fa fa-chevron-down d-lg-none"/>
+                </a>
+            </div>
+            <ul id="collapse_meet_room_aside" class="list-unstyled collapse d-lg-block mb-0">
+                <li t-foreach="meeting_rooms_other" t-as="meeting_room_other">
+                    <a class="d-block w-100 h-100 px-2 pt-2 pb-1 text-decoration-none"
+                        t-att-href="'/event/%s/meeting_room/%s' % (slug(event), slug(meeting_room_other))">
+                        <div class="flex-grow-1 mw-100">
+                            <div class="text-truncate" t-esc="meeting_room_other.name"/>
+                            <span class="text-muted" t-esc="meeting_room_other.summary"></span>
+                            <div class="d-flex justify-content-between align-items-center">
+                                <div class="text-muted">
+                                    <b>&amp;#9900;&amp;nbsp;</b>
+                                    <small><t t-esc="meeting_room_other.room_participant_count"/> <t t-esc="meeting_room_other.target_audience"/></small>
+                                </div>
+                                <small t-if="meeting_room_other.room_lang_id" class="text-muted"><i class="fa fa-globe"/> <t t-esc="meeting_room_other.room_lang_id.name"/></small>
+                            </div>
+                        </div>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</template>
+
+</odoo>
diff --git a/addons/website_event_meet/views/event_meeting_room_views.xml b/addons/website_event_meet/views/event_meeting_room_views.xml
new file mode 100644
index 00000000000..9012ee443bd
--- /dev/null
+++ b/addons/website_event_meet/views/event_meeting_room_views.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="website_event_meet.event_meeting_room_action" model="ir.actions.act_window">
+        <field name="name">Meeting Room</field>
+        <field name="res_model">event.meeting.room</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <record id="event_meeting_room_view_search" model="ir.ui.view">
+        <field name="name">event.meeting.room.search</field>
+        <field name="model">event.meeting.room</field>
+        <field name="arch" type="xml">
+            <search string="Meeting Room">
+                <field name="event_id"/>
+            </search>
+        </field>
+    </record>
+    <record id="event_meeting_room_view_form" model="ir.ui.view">
+        <field name="name">event.meeting.room.form</field>
+        <field name="model">event.meeting.room</field>
+        <field name="arch" type="xml">
+            <form string="Meeting Room">
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <field name="website_url" invisible="1"/>
+                        <field name="is_published" widget="website_redirect_button"/>
+                    </div>
+                    <label for="name"/>
+                    <h1>
+                        <field name="name" placeholder="e.g. Finance"/>
+                    </h1>
+                    <group>
+                        <group>
+                            <field name="event_id"/>
+                            <field name="summary" placeholder="e.g. Let's talk about Corporate Finance"/>
+                            <field name="target_audience" placeholder="e.g. Accountants"/>
+                            <field name="is_pinned"/>
+                        </group>
+                        <group>
+                            <field name="chat_room_id"/>
+                            <field name="room_participant_count" readonly="1"/>
+                            <field name="room_max_capacity" widget="radio" options="{'horizontal': true}"/>
+                            <field name="room_lang_id" options="{'no_create': True}"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page name="Reporting" string="Reporting">
+                            <group>
+                                <field name="room_last_activity"/>
+                                <field name="room_max_participant_reached"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="event_meeting_room_view_tree" model="ir.ui.view">
+        <field name="name">event.meeting.room.tree</field>
+        <field name="model">event.meeting.room</field>
+        <field name="arch" type="xml">
+            <tree string="Meeting Room">
+                <field name="name"/>
+                <field name="summary"/>
+                <field name="target_audience"/>
+                <field name="is_published"/>
+                <field name="is_pinned"/>
+                <field name="room_is_full"/>
+                <field name="room_participant_count"/>
+                <field name="room_max_capacity"/>
+                <field name="room_lang_id"/>
+            </tree>
+        </field>
+    </record>
+    <record id="event_meeting_room_view_search" model="ir.ui.view">
+        <field name="name">event.meeting.room.search</field>
+        <field name="model">event.meeting.room</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name" string="Topic"/>
+                <field name="summary" string="Summary"/>
+                <field name="target_audience" string="Audience"/>
+                <field name="event_id" string="Event"/>
+                <filter domain="[('is_published', '=', False)]" name="filter_unpublished" string="Unpublished"/>
+                <group expand="0" string="Group By">
+                    <filter string="Event" name="groupby_event" domain="[]" context="{'group_by': 'event_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_event_meet/views/event_type_views.xml b/addons/website_event_meet/views/event_type_views.xml
new file mode 100644
index 00000000000..8e76e97f4d6
--- /dev/null
+++ b/addons/website_event_meet/views/event_type_views.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<odoo><data>
+    <record id="event_type_view_form" model="ir.ui.view">
+        <field name="name">event.type.view.form.inherit.meet</field>
+        <field name="model">event.type</field>
+        <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='website_menu']" position='after'>
+                <div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
+                    <label class="col-lg-4" for="meeting_room_allow_creation"/> <field name="meeting_room_allow_creation"/>
+                </div>
+            </xpath>
+            <xpath expr="//div[@id='community-menu']" position="attributes">
+                <attribute name="groups"></attribute>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_meet_quiz/__init__.py b/addons/website_event_meet_quiz/__init__.py
new file mode 100644
index 00000000000..dd15b5c32e5
--- /dev/null
+++ b/addons/website_event_meet_quiz/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
diff --git a/addons/website_event_meet_quiz/__manifest__.py b/addons/website_event_meet_quiz/__manifest__.py
new file mode 100644
index 00000000000..bc8d83d03d8
--- /dev/null
+++ b/addons/website_event_meet_quiz/__manifest__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Quiz and Meet on community',
+    'category': 'Marketing/Events',
+    'sequence': 1007,
+    'version': '1.0',
+    'summary': 'Quiz and Meet on community route',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        'website_event_meet',
+        'website_event_track_quiz',
+    ],
+    'data': [
+        'views/event_meet_templates.xml',
+    ],
+    'demo': [
+    ],
+    'application': False,
+    'auto_install': True,
+}
diff --git a/addons/website_event_meet_quiz/controllers/__init__.py b/addons/website_event_meet_quiz/controllers/__init__.py
new file mode 100644
index 00000000000..677fb9d9c1d
--- /dev/null
+++ b/addons/website_event_meet_quiz/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import community
diff --git a/addons/website_event_meet_quiz/controllers/community.py b/addons/website_event_meet_quiz/controllers/community.py
new file mode 100644
index 00000000000..5086a9e1881
--- /dev/null
+++ b/addons/website_event_meet_quiz/controllers/community.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import http
+
+from odoo.addons.website_event_track_online.controllers.community import WebsiteEventCommunityController
+from odoo.http import request
+from werkzeug.exceptions import Forbidden
+
+
+class WebsiteEventTrackQuizMeetController(WebsiteEventCommunityController):
+
+    @http.route(['/event/<model("event.event"):event>/community'], type='http', auth="public", website=True, sitemap=False)
+    def community(self, event, page=1, lang=None, **kwargs):
+        if not event.can_access_from_current_website():
+            raise Forbidden()
+
+        # website_event_track_quiz
+        values = self._get_community_leaderboard_render_values(event, kwargs.get('search'), page)
+
+        # website_event_meet
+        values.update(self._event_meeting_rooms_get_values(event, lang=lang))
+        return request.render('website_event_meet.event_meet', values)
diff --git a/addons/website_event_meet_quiz/views/event_meet_templates.xml b/addons/website_event_meet_quiz/views/event_meet_templates.xml
new file mode 100644
index 00000000000..04b7be6b768
--- /dev/null
+++ b/addons/website_event_meet_quiz/views/event_meet_templates.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<template id="community_aside" name="Community: Aside (Leaderboard)"
+    inherit_id="website_event_meet.community_aside">
+    <xpath expr="//div[hasclass('o_wevent_community_aside')]" position="inside">
+        <t t-if="top3_visitors" t-call="website_event_meet_quiz.community_leaderboard_small"/>
+    </xpath>
+</template>
+
+<template id="community_leaderboard_small" name="Small Leaderboard">
+    <div class="row">
+        <div class="col">
+            <div class="w-100 d-flex justify-content-between align-items-end o_page_header">
+                <h1 class="m-0">Leaderboard</h1>
+                <a t-attf-href="#{'/event/%s/community/leaderboard' % (slug(event))}">View all</a>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            <t t-foreach="top3_visitors" t-as="visitor">
+                <t t-call="website_event_meet_quiz.visitor_quiz_points_card"/>
+            </t>
+        </div>
+    </div>
+</template>
+
+<template id='visitor_quiz_points_card' name="User Quick Quiz Points Card">
+    <div class="d-flex mb-3 align-items-center justify-content-between">
+        <div class="d-flex align-items-center">
+            <b class="mr-2 text-muted" t-esc="visitor['position']"/>
+            <img class="rounded-circle float-left"
+                style="width: 32px; height: 32px; object-fit: cover;"
+                t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/src/img/user_placeholder.jpg'"
+                t-att-alt="visitor['visitor'].display_name"/>
+            <div style="line-height:1.3">
+                <span class="font-weight-bold" t-esc="visitor['visitor'].display_name"/>
+            </div>
+        </div>
+        <div class="d-flex align-items-center">
+            <span><t t-esc="visitor['points']"/> Points</span>
+        </div>
+    </div>
+</template>
+
+</odoo>
diff --git a/addons/website_event_online/__init__.py b/addons/website_event_online/__init__.py
new file mode 100644
index 00000000000..5a31f331a2a
--- /dev/null
+++ b/addons/website_event_online/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
+from . import models
+from . import tests
diff --git a/addons/website_event_online/__manifest__.py b/addons/website_event_online/__manifest__.py
new file mode 100644
index 00000000000..115bf41a466
--- /dev/null
+++ b/addons/website_event_online/__manifest__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Events Online',
+    'category': 'Marketing/Events',
+    'sequence': 1001,
+    'version': '1.0',
+    'summary': 'Bridge module to support Online Events',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        'website_event'
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/assets.xml',
+        'views/event_event_views.xml',
+        'views/event_registration_views.xml',
+        'views/event_tag_views.xml',
+        'views/event_type_views.xml',
+        'views/website_visitor_views.xml',
+        'views/event_templates_event.xml',
+    ],
+    'demo': [
+        'data/website_visitor_demo.xml',
+        'data/event_demo.xml',
+        'data/event_registration_demo.xml',
+        'data/event_tag_demo.xml',
+    ],
+    'application': False,
+    'installable': True,
+}
diff --git a/addons/website_event_online/controllers/__init__.py b/addons/website_event_online/controllers/__init__.py
new file mode 100644
index 00000000000..20ce9ac3fb4
--- /dev/null
+++ b/addons/website_event_online/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_registration
diff --git a/addons/website_event_online/controllers/event_registration.py b/addons/website_event_online/controllers/event_registration.py
new file mode 100644
index 00000000000..a504f1000f1
--- /dev/null
+++ b/addons/website_event_online/controllers/event_registration.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.website_event.controllers.main import WebsiteEventController
+from odoo.http import request
+
+
+class WebsiteEventOnlineController(WebsiteEventController):
+
+    def _create_attendees_from_registration_post(self, event, registration_data):
+        """ Override registration data to try to set a visitor (from request) and
+        a partner (if visitor linked to a user for example). Purpose is to gather
+        as much informations as possible, notably to ease future communications.
+        Also try to update visitor informations based on registration info. """
+        visitor_sudo = request.env['website.visitor']._get_visitor_from_request(force_create=True)
+        visitor_sudo._update_visitor_last_visit()
+
+        if visitor_sudo:
+            visitor_values = {}
+            for info in registration_data:
+                # registration may give a name to the visitor, yay
+                if info.get('name') and not visitor_sudo.name and not visitor_values.get('name'):
+                    visitor_values['name'] = info['name']
+                # update registration based on visitor
+                info['visitor_id'] = visitor_sudo.id
+                if not info.get('partner_id') and visitor_sudo.partner_id:
+                    info['partner_id'] = visitor_sudo.partner_id.id
+            if visitor_values:
+                visitor_sudo.write(visitor_values)
+
+        return super(WebsiteEventOnlineController, self)._create_attendees_from_registration_post(event, registration_data)
diff --git a/addons/website_event_online/data/event_demo.xml b/addons/website_event_online/data/event_demo.xml
new file mode 100644
index 00000000000..ff2bde98b40
--- /dev/null
+++ b/addons/website_event_online/data/event_demo.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="event.event_1" model="event.event">
+        <field name="menu_register_cta" eval="True"/>
+    </record>
+    <record id="event.event_7" model="event.event">
+        <field name="menu_register_cta" eval="True"/>
+    </record>
+</odoo>
diff --git a/addons/website_event_online/data/event_registration_demo.xml b/addons/website_event_online/data/event_registration_demo.xml
new file mode 100644
index 00000000000..d89b4d1aabf
--- /dev/null
+++ b/addons/website_event_online/data/event_registration_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <!-- OpenWood Collection Online Reveal: Gemini (all) -->
+    <record id="event.event_registration_7_0" model="event.registration">
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_0"/>
+    </record>
+    <record id="event.event_registration_7_1" model="event.registration">
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_0"/>
+    </record>
+    <record id="event.event_registration_7_2" model="event.registration">
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_1"/>
+    </record>
+    <record id="event.event_registration_7_3" model="event.registration">
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_1"/>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_online/data/event_tag_demo.xml b/addons/website_event_online/data/event_tag_demo.xml
new file mode 100644
index 00000000000..391eb867aa6
--- /dev/null
+++ b/addons/website_event_online/data/event_tag_demo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="event.event_tag_category_1_tag_1" model="event.tag">
+        <field name="color">1</field>
+    </record>
+    <record id="event.event_tag_category_1_tag_2" model="event.tag">
+        <field name="color">2</field>
+    </record>
+    <record id="event.event_tag_category_1_tag_3" model="event.tag">
+        <field name="color">3</field>
+    </record>
+    <record id="event.event_tag_category_1_tag_4" model="event.tag">
+        <field name="color">4</field>
+    </record>
+
+    <record id="event.event_tag_category_2_tag_1" model="event.tag">
+        <field name="color">5</field>
+    </record>
+    <record id="event.event_tag_category_2_tag_2" model="event.tag">
+        <field name="color">6</field>
+    </record>
+    <record id="event.event_tag_category_2_tag_3" model="event.tag">
+        <field name="color">7</field>
+    </record>
+
+    <record id="event.event_tag_category_3_tag_1" model="event.tag">
+        <field name="color">8</field>
+    </record>
+    <record id="event.event_tag_category_3_tag_2" model="event.tag">
+        <field name="color">9</field>
+    </record>
+</odoo>
diff --git a/addons/website_event_online/data/website_visitor_demo.xml b/addons/website_event_online/data/website_visitor_demo.xml
new file mode 100644
index 00000000000..174b1c17b68
--- /dev/null
+++ b/addons/website_event_online/data/website_visitor_demo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="website_visitor_event_0" model="website.visitor">
+        <field name="name">Edwin Hansen</field>
+        <field name="partner_id" ref="base.res_partner_address_5"/>
+        <field name="country_id" ref="base.us"/>
+    </record>
+    <record id="website_visitor_event_1" model="website.visitor">
+        <field name="name">Soham Palmer</field>
+        <field name="partner_id" ref="base.res_partner_address_11"/>
+        <field name="country_id" ref="base.us"/>
+    </record>
+    <record id="website_visitor_event_2" model="website.visitor">
+        <field name="name">Philipe J. Fry</field>
+        <field name="partner_id" eval="False"/>
+        <field name="country_id" ref="base.be"/>
+    </record>
+    <record id="website_visitor_event_2_1" model="website.visitor">
+        <field name="name">Philipe J. Fry (old)</field>
+        <field name="parent_id" ref="website_event_online.website_visitor_event_2"/>
+        <field name="partner_id" eval="False"/>
+        <field name="country_id" ref="base.be"/>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_online/models/__init__.py b/addons/website_event_online/models/__init__.py
new file mode 100644
index 00000000000..e6dbdc4c033
--- /dev/null
+++ b/addons/website_event_online/models/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_event
+from . import event_registration
+from . import event_tag
+from . import website_visitor
diff --git a/addons/website_event_online/models/event_event.py b/addons/website_event_online/models/event_event.py
new file mode 100644
index 00000000000..05064c3b929
--- /dev/null
+++ b/addons/website_event_online/models/event_event.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from datetime import datetime
+from pytz import timezone, utc
+
+from odoo import api, fields, models, _
+from odoo.addons.http_routing.models.ir_http import slug
+from odoo.addons.resource.models.resource import float_to_time
+from odoo.osv import expression
+
+
+class Event(models.Model):
+    _name = 'event.event'
+    _inherit = 'event.event'
+
+    # frontend options
+    menu_register_cta = fields.Boolean(
+        'Add Register Button', compute='_compute_menu_register_cta',
+        readonly=False, store=True)
+    # live information
+    is_ongoing = fields.Boolean(
+        'Is Ongoing', compute='_compute_time_data', search='_search_is_ongoing',
+        help="Whether event has begun")
+    is_done = fields.Boolean(
+        'Is Done', compute='_compute_time_data',
+        help="Whether event is finished")
+    start_today = fields.Boolean(
+        'Start Today', compute='_compute_time_data',
+        help="Whether event is going to start today if still not ongoing")
+    start_remaining = fields.Integer(
+        'Remaining before start', compute='_compute_time_data',
+        help="Remaining time before event starts (minutes)")
+
+    @api.depends('website_menu')
+    def _compute_menu_register_cta(self):
+        for event in self:
+            event.menu_register_cta = event.website_menu
+
+    @api.depends('date_begin', 'date_end')
+    def _compute_time_data(self):
+        """ Compute start and remaining time. Do everything in UTC as we compute only
+        time deltas here. """
+        now_utc = utc.localize(fields.Datetime.now().replace(microsecond=0))
+        for event in self:
+            date_begin_utc = utc.localize(event.date_begin, is_dst=False)
+            date_end_utc = utc.localize(event.date_end, is_dst=False)
+            event.is_ongoing = date_begin_utc <= now_utc <= date_end_utc
+            event.is_done = now_utc > date_end_utc
+            event.start_today = date_begin_utc.date() == now_utc.date()
+            if date_begin_utc >= now_utc:
+                td = date_begin_utc - now_utc
+                event.start_remaining = int(td.total_seconds() / 60)
+            else:
+                event.start_remaining = 0
+
+    def _compute_is_participating(self):
+        """ Override is_participating to improve heuristic that is now
+
+          * public, no visitor: not participating as we have no information;
+          * public and visitor: check visitor is linked to a registration. As
+            visitors are merged on the top parent, current visitor check is
+            sufficient even for successive visits;
+          * logged, no visitor: check partner is linked to a registration. Do
+            not check the email as it is not really secure;
+          * logged as visitor: check partner or visitor are linked to a
+            registration;
+        """
+        current_visitor = self.env['website.visitor']._get_visitor_from_request(force_create=False)
+        if self.env.user._is_public() and not current_visitor:
+            events = self.env['event.event']
+        elif self.env.user._is_public():
+            events = self.env['event.registration'].sudo().search([
+                ('event_id', 'in', self.ids),
+                ('visitor_id', '=', current_visitor.id),
+            ]).event_id
+        else:
+            if current_visitor:
+                domain = [
+                    '|',
+                    ('partner_id', '=', self.env.user.partner_id.id),
+                    ('visitor_id', '=', current_visitor.id)
+                ]
+            else:
+                domain = [('partner_id', '=', self.env.user.partner_id.id)]
+            events = self.env['event.registration'].sudo().search(
+                expression.AND([
+                    domain,
+                    [('event_id', 'in', self.ids)]
+                ])
+            ).event_id
+
+
+        for event in self:
+            event.is_participating = event in events
+
+    # ------------------------------------------------------------
+    # WEBSITE MENU MANAGEMENT
+    # ------------------------------------------------------------
+
+    def _get_menu_entries(self):
+        """ Deprecate old method as a new one with more information is used
+        starting with website_event_online module. """
+        return []
+
+    def _get_menu_entries_online(self):
+        """ Method returning menu entries to display on the website view of the
+        event, possibly depending on some options in inheriting modules.
+
+        Each menu entry is a tuple containing :
+          * name: menu item name
+          * url: if set, url to a route (do not use xml_id in that case);
+          * xml_id: template linked to the page (do not use url in that case);
+          * sequence: specific sequence of menu entry to be set on the menu;
+          * menu_type: type of menu entry (used in inheriting modules to ease
+            menu management; not used in this module in 13.3 due to technical
+            limitations);
+        """
+        self.ensure_one()
+        return [
+            (_('Introduction'), False, 'website_event.template_intro', 1, False),
+            (_('Location'), False, 'website_event.template_location', 50, False),
+            (_('Register'), '/event/%s/register' % slug(self), False, 100, False),
+        ]
+
+    def _update_website_menus(self, menus_update_by_field=None):
+        """ Synchronize event configuration and its menu entries for frontend. """
+        super(Event, self)._update_website_menus(menus_update_by_field=menus_update_by_field)
+        for event in self:
+            if event.website_menu and (not menus_update_by_field or event in menus_update_by_field.get('website_menu')):
+                for name, url, xml_id, menu_sequence, menu_type in event._get_menu_entries_online():
+                    event._create_menu(menu_sequence, name, url, xml_id, menu_type=menu_type)
diff --git a/addons/website_event_online/models/event_registration.py b/addons/website_event_online/models/event_registration.py
new file mode 100644
index 00000000000..8b56c14f742
--- /dev/null
+++ b/addons/website_event_online/models/event_registration.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class EventRegistration(models.Model):
+    _name = 'event.registration'
+    _inherit = ['event.registration']
+
+    visitor_id = fields.Many2one('website.visitor', string='Visitor', ondelete='set null')
diff --git a/addons/website_event_online/models/event_tag.py b/addons/website_event_online/models/event_tag.py
new file mode 100644
index 00000000000..4ac8cf42272
--- /dev/null
+++ b/addons/website_event_online/models/event_tag.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields
+
+
+class EventTag(models.Model):
+    _inherit = ['event.tag']
+
+    color = fields.Integer(string='Color Index')
diff --git a/addons/website_event_online/models/website_visitor.py b/addons/website_event_online/models/website_visitor.py
new file mode 100644
index 00000000000..bd767cab171
--- /dev/null
+++ b/addons/website_event_online/models/website_visitor.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class WebsiteVisitor(models.Model):
+    _name = 'website.visitor'
+    _inherit = ['website.visitor']
+
+    parent_id = fields.Many2one(
+        'website.visitor', string="Parent", ondelete='set null',
+        help="Main identity")
+    event_registration_ids = fields.One2many(
+        'event.registration', 'visitor_id', string='Event Registrations',
+        groups="event.group_event_user")
+    event_registration_count = fields.Integer(
+        '# Registrations', compute='_compute_event_registration_count',
+        groups="event.group_event_user")
+    event_registered_ids = fields.Many2many(
+        'event.event', string="Registered Events",
+        compute="_compute_event_registered_ids", compute_sudo=True,
+        search="_search_event_registered_ids",
+        groups="event.group_event_user")
+
+    @api.depends('event_registration_ids')
+    def _compute_event_registration_count(self):
+        if self.ids:
+            read_group_res = self.env['event.registration'].read_group(
+                [('visitor_id', 'in', self.ids)],
+                ['visitor_id'], ['visitor_id'])
+            visitor_mapping = dict(
+                (item['visitor_id'][0], item['visitor_id_count'])
+                for item in read_group_res)
+        else:
+            visitor_mapping = dict()
+        for visitor in self:
+            visitor.event_registration_count = visitor_mapping.get(visitor.id) or 0
+
+    @api.depends('event_registration_ids.email', 'event_registration_ids.mobile', 'event_registration_ids.phone')
+    def _compute_email_phone(self):
+        super(WebsiteVisitor, self)._compute_email_phone()
+        self.flush()
+
+        for visitor in self.filtered(lambda visitor: not visitor.email or not visitor.mobile):
+            linked_registrations = visitor.event_registration_ids.sorted('create_date', reverse=True)
+            if not visitor.email:
+                visitor.email = next((reg.email for reg in linked_registrations if reg.email), False)
+            if not visitor.mobile:
+                visitor.mobile = next((reg.mobile or reg.phone for reg in linked_registrations if reg.mobile or reg.phone), False)
+
+    @api.depends('parent_id', 'event_registration_ids')
+    def _compute_event_registered_ids(self):
+        # include parent's registrations in a visitor o2m field. We don't add
+        # child one as child should not have registrations (moved to the parent)
+        for visitor in self:
+            all_registrations = visitor.event_registration_ids | visitor.parent_id.event_registration_ids
+            visitor.event_registered_ids = all_registrations.mapped('event_id')
+
+    def _search_event_registered_ids(self, operator, operand):
+        """ Search visitors with terms on events within their event registrations. E.g. [('event_registered_ids',
+        'in', [1, 2])] should return visitors having a registration on events 1, 2 as
+        well as their children for notification purpose. """
+        if operator == "not in":
+            raise NotImplementedError("Unsupported 'Not In' operation on visitors registrations")
+
+        all_registrations = self.env['event.registration'].sudo().search([
+            ('event_id', operator, operand)
+        ])
+        if all_registrations:
+            # search children, even archived one, to contact them
+            visitors = all_registrations.with_context(active_test=False).mapped('visitor_id')
+            children = self.env['website.visitor'].with_context(
+                active_test=False
+            ).sudo().search([('parent_id', 'in', visitors.ids)])
+            visitor_ids = (visitors + children).ids
+        else:
+            visitor_ids = []
+
+        return [('id', 'in', visitor_ids)]
+
+    def _link_to_partner(self, partner, update_values=None):
+        """ Propagate partner update to registration records """
+        if partner:
+            registration_wo_partner = self.event_registration_ids.filtered(lambda registration: not registration.partner_id)
+            if registration_wo_partner:
+                registration_wo_partner.partner_id = partner
+        super(WebsiteVisitor, self)._link_to_partner(partner, update_values=update_values)
+
+    def _link_to_visitor(self, target, keep_unique=True):
+        """ Override linking process to link registrations to the final visitor. """
+        self.event_registration_ids.write({'visitor_id': target.id})
+
+        res = super(WebsiteVisitor, self)._link_to_visitor(target, keep_unique=False)
+
+        if keep_unique:
+            self.partner_id = False
+            self.parent_id = target.id
+            self.active = False
+
+        return res
+
+    def _get_visitor_from_request(self, force_create=False):
+        """ When fetching visitor, now that duplicates are linked to a main visitor
+        instead of unlinked, you may have more collisions issues with cookie being
+        set after a de-connection for example.
+
+        In base method, visitor associated to a partner in case of public user is
+        not taken into account. It is considered as desynchronized cookie. Here
+        we also discard if the visitor has a main visitor whose partner is set
+        (aka wrong after logout partner). """
+        visitor = super(WebsiteVisitor, self)._get_visitor_from_request(force_create=force_create)
+
+        # also check that visitor parent partner is not different from user's one (indicates duplicate due to invalid or wrong cookie)
+        if visitor and visitor.parent_id.partner_id:
+            if self.env.user._is_public():
+                visitor = self.env['website.visitor'].sudo()
+            elif not visitor.partner_id:
+                visitor = self.env['website.visitor'].sudo().with_context(active_test=False).search(
+                    [('partner_id', '=', self.env.user.partner_id.id)]
+                )
+
+        if not visitor and force_create:
+            visitor = self._create_visitor()
+
+        return visitor
diff --git a/addons/website_event_online/security/ir.model.access.csv b/addons/website_event_online/security/ir.model.access.csv
new file mode 100644
index 00000000000..20948d77e58
--- /dev/null
+++ b/addons/website_event_online/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+website_visitor_access_event_user,website.visitor.access.event.user,model_website_visitor,event.group_event_user,1,1,0,0
diff --git a/addons/website_event_online/static/src/js/display_timer_widget.js b/addons/website_event_online/static/src/js/display_timer_widget.js
new file mode 100644
index 00000000000..0ada123c3b0
--- /dev/null
+++ b/addons/website_event_online/static/src/js/display_timer_widget.js
@@ -0,0 +1,111 @@
+odoo.define('website_event_online.display_timer_widget', function (require) {
+'use strict';
+
+var core = require('web.core');
+var _t = core._t;
+var publicWidget = require('web.public.widget');
+
+publicWidget.registry.displayTimerWidget = publicWidget.Widget.extend({
+    selector: '.o_display_timer',
+
+    /**
+     * This widget allows to display a dom element at the end of a certain time laps.
+     * There are 2 timers available:
+     *   - The main-timer: display the DOM element (using the displayClass) at the end of this timer.
+     *   - The pre-timer: additional timer to display the main-timer. This pre-timer can be invisible or visible,
+     *                    depending of the startCountdownDisplay option. Once the pre-timer is over,
+                          the main-timer is displayed.
+     * @override
+     */
+    start: function () {
+        var self = this;
+        return this._super.apply(this, arguments).then(function () {
+            self.options = self.$target.data();
+            self.preCountdownDisplay = self.options["preCountdownDisplay"];
+            self.preCountdownTime = self.options["preCountdownTime"];
+            self.preCountdownText = self.options["preCountdownText"];
+
+            self.mainCountdownTime = self.options["mainCountdownTime"];
+            self.mainCountdownText = self.options["mainCountdownText"];
+            self.mainCountdownDisplay = self.options["mainCountdownDisplay"];
+
+            self.displayClass = self.options["displayClass"];
+
+            if (self.preCountdownDisplay) {
+                $(self.$el).parent().removeClass('d-none');
+            }
+
+            self._checkTimer();
+            self.interval = setInterval(function () { self._checkTimer(); }, 1000);
+        });
+    },
+
+    /**
+     * This method removes 1 second to the current timer (pre-timer or main-timer)
+     * and call the method to update the DOM, unless main-timer is over. In that last case,
+     * the DOM element to show is displayed.
+     *
+     * @private
+     */
+    _checkTimer: function () {
+        var now = new Date();
+
+        var remainingPreSeconds = this.preCountdownTime - (now.getTime()/1000);
+        if (remainingPreSeconds <= 1) {
+            this.$('.o_countdown_text').text(this.mainCountdownText);
+            if (this.mainCountdownDisplay) {
+                $(this.$el).parent().removeClass('d-none');
+            }
+            var remainingMainSeconds = this.mainCountdownTime - (now.getTime()/1000);
+            if (remainingMainSeconds <= 1) {
+                clearInterval(this.interval);
+                $(this.displayClass).removeClass('d-none');
+                $(this.$el).parent().addClass('d-none');
+            } else {
+                this._updateCountdown(remainingMainSeconds);
+            }
+        } else {
+            this._updateCountdown(remainingPreSeconds);
+        }
+    },
+
+    /**
+     * This method update the DOM to display the remaining time.
+     * from seconds, the method extract the number of days, hours, minutes and seconds and
+     * override the different DOM elements values.
+     *
+     * @private
+     */
+    _updateCountdown: function (remainingTime) {
+        var remainingSeconds = remainingTime;
+        var days = Math.floor(remainingSeconds / 86400);
+
+        remainingSeconds = remainingSeconds % 86400;
+        var hours = Math.floor(remainingSeconds / 3600);
+
+        remainingSeconds = remainingSeconds % 3600;
+        var minutes = Math.floor(remainingSeconds / 60);
+
+        remainingSeconds = Math.floor(remainingSeconds % 60);
+
+        this.$("span.o_timer_days").text(days);
+        this.$("span.o_timer_hours").text(this._zeroPad(hours, 2));
+        this.$("span.o_timer_minutes").text(this._zeroPad(minutes, 2));
+        this.$("span.o_timer_seconds").text(this._zeroPad(remainingSeconds, 2));
+    },
+
+    /**
+     * Small tool to add leading zéros to the given number, in function of the needed number of leading zéros.
+     *
+     * @private
+     */
+    _zeroPad: function (num, places) {
+      var zero = places - num.toString().length + 1;
+      return new Array(+(zero > 0 && zero)).join("0") + num;
+    },
+
+});
+
+return publicWidget.registry.countdownWidget;
+
+});
diff --git a/addons/website_event_online/static/src/js/register_toaster_widget.js b/addons/website_event_online/static/src/js/register_toaster_widget.js
new file mode 100644
index 00000000000..83397e74c40
--- /dev/null
+++ b/addons/website_event_online/static/src/js/register_toaster_widget.js
@@ -0,0 +1,31 @@
+odoo.define('website_event_online.register_toaster_widget', function (require) {
+'use strict';
+
+let core = require('web.core');
+let _t = core._t;
+let publicWidget = require('web.public.widget');
+
+publicWidget.registry.RegisterToasterWidget = publicWidget.Widget.extend({
+    selector: '.o_wevent_register_toaster',
+
+    /**
+     * This widget allows to display a toast message on the page.
+     *
+     * @override
+     */
+    start: function () {
+        const message = this.$el.data('message');
+        if (message && message.length) {
+            this.displayNotification({
+                title: _t("Register"),
+                message: message,
+                type: 'info'
+            });
+        }
+        return this._super.apply(this, arguments);
+    },
+});
+
+return publicWidget.registry.RegisterToasterWidget;
+
+});
diff --git a/addons/website_event_online/static/src/scss/website_event_templates.scss b/addons/website_event_online/static/src/scss/website_event_templates.scss
new file mode 100644
index 00000000000..e0bef5a6c54
--- /dev/null
+++ b/addons/website_event_online/static/src/scss/website_event_templates.scss
@@ -0,0 +1,130 @@
+// Color tags according to assigned background color.
+
+.o_wevent_index, .o_wevent_event {
+
+    // Text Ellipsis for Event title in mobile mode
+    nav > div > a.navbar-brand {
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        max-width: calc(100% - 80px);
+    }
+
+    // Simple colored tags according to assigned background color
+    @for $size from 1 through length($o-colors) {
+        .o_tag_color_#{$size - 1} {
+            @if $size == 1 {
+                & {
+                    background-color: white;
+                    color: nth($o-colors, $size);
+                    box-shadow: inset 0 0 0 2px nth($o-colors, $size);
+                }
+                &::after {
+                    background-color: nth($o-colors, $size);
+                }
+            } @else {
+                &, &::after {
+                    background-color: nth($o-colors, $size);
+                    color: $white;
+                }
+            }
+        }
+    }
+
+    // Complex colored tags according to assigned background color with hover effect
+    @for $size from 1 through length($o-colors) {
+        .o_tag_color_hovered_#{$size - 1} {
+            $background-color: white;
+            // no color selected
+            @if $size == 1 {
+                & {
+                    color: black;
+                    background-color: $background-color;
+                    box-shadow: inset 0 0 0 1px nth($o-colors, $size);
+                }
+            } @else {
+                $background-color: nth($o-colors, $size);
+                & {
+                    color: white;
+                    background-color: $background-color;
+                }
+            }
+            @at-root a#{&} {
+                &:hover {
+                    background-color: darken($background-color, 20%);
+                }
+            }
+        }
+    }
+
+    /*
+     * COMMON TO ALL ONLINE-* PAGES
+     */
+
+    .o_wevent_online {
+        // unpublished badge: put opacity to distinguish form other badges
+        .o_wevent_online_badge_unpublished{
+            opacity: 0.4;
+        }
+
+        &.o_wevent_online_bg {
+            @if (color('body') == $o-portal-default-body-bg) {
+                @extend .bg-100;
+            }
+        }
+
+        .o_wevent_online_page_container {
+            // Widescreen mode
+            @include media-breakpoint-up(md) {
+                &:not(.container) {
+                    padding-left: 0.5rem;
+                    padding-right: 0.5rem;
+                }
+            }
+
+            // Main panel
+            .o_wevent_online_page_main {
+                border: 1px solid $border-color;
+
+                @include media-breakpoint-up(md) {
+                    border-top-width: 0;
+                }
+
+                .o_wevent_online_page_avatar {
+                    min-width: 64px;
+
+                    img {
+                        max-width: 96px;
+                    }
+                }
+            }
+
+            // Left panel
+            .o_wevent_online_page_aside {
+
+                // Left panel: content display
+                .o_wevent_online_page_aside_content {
+                    border: 1px solid $border-color;
+
+                    @include media-breakpoint-up(md) {
+                        border-top-width: 0;
+                    }
+
+                    li:not(.nav-item) {
+                        border-bottom: 1px solid $border-color;
+                        &:first-child {
+                            border-top: 1px solid $border-color;
+                        }
+                        &:last-child {
+                            border-bottom: 0px;
+                        }
+                    }
+
+                    .o_wevent_online_page_aside_collapse:not(.collapsed) {
+                        transform: rotate(180deg);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/addons/website_event_online/tests/__init__.py b/addons/website_event_online/tests/__init__.py
new file mode 100644
index 00000000000..7599117c507
--- /dev/null
+++ b/addons/website_event_online/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import common
+from . import test_visitor_events
diff --git a/addons/website_event_online/tests/common.py b/addons/website_event_online/tests/common.py
new file mode 100644
index 00000000000..58f1779a6af
--- /dev/null
+++ b/addons/website_event_online/tests/common.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from datetime import datetime, timedelta, time
+from unittest.mock import patch
+
+from odoo.addons.event.tests.common import TestEventCommon
+from odoo.fields import Datetime as FieldsDatetime, Date as FieldsDate
+from odoo.tests.common import SavepointCase
+
+
+class EventDtPatcher(SavepointCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(EventDtPatcher, cls).setUpClass()
+
+        cls.reference_now = datetime(2020, 7, 6, 10, 0, 0)
+        cls.reference_today = datetime(2020, 7, 6)
+
+        cls.event_dt = patch(
+            'odoo.addons.event.models.event_event.fields.Datetime',
+            wraps=FieldsDatetime
+        )
+        cls.wevent_main_dt = patch(
+            'odoo.addons.website_event.controllers.main.fields.Datetime',
+            wraps=FieldsDatetime
+        )
+        cls.event_online_dt = patch(
+            'odoo.addons.website_event_online.models.event_event.fields.Datetime',
+            wraps=FieldsDatetime
+        )
+        cls.event_date = patch(
+            'odoo.addons.event.models.event_event.fields.Date',
+            wraps=FieldsDate
+        )
+        cls.wevent_main_date = patch(
+            'odoo.addons.website_event.controllers.main.fields.Date',
+            wraps=FieldsDate
+        )
+        cls.mock_event_dt = cls.event_dt.start()
+        cls.mock_wevent_main_dt = cls.wevent_main_dt.start()
+        cls.mock_event_online_dt = cls.event_online_dt.start()
+        cls.mock_event_date = cls.event_date.start()
+        cls.mock_wevent_main_date = cls.wevent_main_date.start()
+        cls.mock_event_dt.now.return_value = cls.reference_now
+        cls.mock_wevent_main_dt.now.return_value = cls.reference_now
+        cls.mock_event_online_dt.now.return_value = cls.reference_now
+        cls.mock_event_date.today.return_value = cls.reference_today
+        cls.mock_wevent_main_date.today.return_value = cls.reference_today
+        cls.addClassCleanup(cls.event_dt.stop)
+        cls.addClassCleanup(cls.wevent_main_dt.stop)
+        cls.addClassCleanup(cls.event_online_dt.stop)
+        cls.addClassCleanup(cls.event_date.stop)
+        cls.addClassCleanup(cls.wevent_main_date.stop)
+
+
+class TestEventOnlineCommon(TestEventCommon, EventDtPatcher):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestEventOnlineCommon, cls).setUpClass()
+
+        # event if 8-18 in Europe/Brussels (DST) (first day: begins at 9, last day: ends at 15)
+        cls.event_0.write({
+            'date_begin': datetime.combine(cls.reference_now, time(7, 0)) - timedelta(days=1),
+            'date_end': datetime.combine(cls.reference_now, time(13, 0)) + timedelta(days=1),
+        })
diff --git a/addons/website_event_online/tests/test_visitor_events.py b/addons/website_event_online/tests/test_visitor_events.py
new file mode 100644
index 00000000000..814cd531ac5
--- /dev/null
+++ b/addons/website_event_online/tests/test_visitor_events.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from datetime import datetime, timedelta
+
+from odoo import fields
+from odoo.addons.event.tests.common import TestEventCommon
+
+
+class TestVisitorEvents(TestEventCommon):
+    def test_visitor_events(self):
+        event_1 = self.env['event.event'].create({
+            'name': 'OtherEvent',
+            'auto_confirm': True,
+            'date_begin': fields.Datetime.to_string(datetime.today() + timedelta(days=1)),
+            'date_end': fields.Datetime.to_string(datetime.today() + timedelta(days=15)),
+        })
+
+        [main_visitor, child_visitor] = self.env['website.visitor'].create([{
+            'name': 'Main Visitor',
+            'event_registration_ids': [(0, 0, {
+                'event_id': self.event_0.id
+            })]
+        }, {
+            'name': 'Child Visitor',
+            'event_registration_ids': [(0, 0, {
+                'event_id': event_1.id
+            })]
+        }])
+
+        self.assertEqual(self.event_0, main_visitor.event_registered_ids)
+        self.assertEqual(event_1, child_visitor.event_registered_ids)
+        self.assertEqual(
+            main_visitor,
+            self.env['website.visitor'].search([('event_registered_ids', 'in', self.event_0.ids)])
+        )
+        self.assertEqual(
+            child_visitor,
+            self.env['website.visitor'].search([('event_registered_ids', 'in', event_1.ids)])
+        )
+        child_visitor._link_to_visitor(main_visitor)
+        self.assertEqual(self.event_0 | event_1, main_visitor.event_registered_ids)
+        self.assertEqual(
+            main_visitor | child_visitor,
+            self.env['website.visitor'].with_context(active_test=False).search([('event_registered_ids', 'in', self.event_0.ids)])
+        )
+        self.assertEqual(
+            main_visitor | child_visitor,
+            self.env['website.visitor'].with_context(active_test=False).search([('event_registered_ids', 'in', event_1.ids)])
+        )
diff --git a/addons/website_event_online/views/assets.xml b/addons/website_event_online/views/assets.xml
new file mode 100644
index 00000000000..f90e1d77168
--- /dev/null
+++ b/addons/website_event_online/views/assets.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Online Assets Frontend">
+        <xpath expr="//link[last()]" position="after">
+            <link rel="stylesheet" type="text/scss" href="/website_event_online/static/src/scss/website_event_templates.scss"/>
+        </xpath>
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/website_event_online/static/src/js/display_timer_widget.js"></script>
+            <script type="text/javascript" src="/website_event_online/static/src/js/register_toaster_widget.js"></script>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/addons/website_event_online/views/event_event_views.xml b/addons/website_event_online/views/event_event_views.xml
new file mode 100644
index 00000000000..4ed754e39b0
--- /dev/null
+++ b/addons/website_event_online/views/event_event_views.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <record id="event_event_view_form" model="ir.ui.view">
+        <field name="name">event.event.view.form.inherit.online</field>
+        <field name="model">event.event</field>
+        <field name="inherit_id" ref="event.view_event_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('oe_title')]" position="after">
+                <div name="event_menu_configuration" groups="base.group_no_one">
+                    <label for="website_menu" string="Website Submenu"/>
+                    <field name="website_menu"/>
+                    <label for="menu_register_cta" string="Register Button"/>
+                    <field name="menu_register_cta"/>
+                </div>
+            </xpath>
+            <xpath expr="//field[@name='tag_ids']" position="attributes">
+                <attribute name="options">{'color_field': 'color', 'no_quick_create': True}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_online/views/event_registration_views.xml b/addons/website_event_online/views/event_registration_views.xml
new file mode 100644
index 00000000000..27e490d6a88
--- /dev/null
+++ b/addons/website_event_online/views/event_registration_views.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<odoo><data>
+    <record id="event_registration_action_from_visitor" model="ir.actions.act_window">
+        <field name="name">Registrations</field>
+        <field name="res_model">event.registration</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="domain">[('visitor_id', 'in', [active_id])]</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_empty_folder">
+                No registration linked to this visitor
+            </p>
+        </field>
+    </record>
+
+    <record id="event_registration_view_form" model="ir.ui.view">
+        <field name="name">event.registration.view.form.inherit.online</field>
+        <field name="model">event.registration</field>
+        <field name="inherit_id" ref="event.view_event_registration_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="visitor_id" groups="base.group_no_one"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_registration_view_tree" model="ir.ui.view">
+        <field name="name">event.registration.view.tree.inherit.online</field>
+        <field name="model">event.registration</field>
+        <field name="inherit_id" ref="event.view_event_registration_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="visitor_id" optional="hide" groups="base.group_no_one"/>
+            </xpath>
+        </field>
+    </record>
+</data></odoo>
diff --git a/addons/website_event_online/views/event_tag_views.xml b/addons/website_event_online/views/event_tag_views.xml
new file mode 100644
index 00000000000..ebaffa264c0
--- /dev/null
+++ b/addons/website_event_online/views/event_tag_views.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<odoo><data>
+    <record id="event_tag_category_view_form" model="ir.ui.view">
+        <field name="name">event.tag.category.view.form.inherit.online</field>
+        <field name="model">event.tag.category</field>
+        <field name="inherit_id" ref="event.event_tag_category_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='tag_ids']//field[@name='name']" position="after">
+                <field name="color" widget="color_picker"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_tag_category_view_list" model="ir.ui.view">
+        <field name="name">event.tag.category.view.tree.inherit.online</field>
+        <field name="model">event.tag.category</field>
+        <field name="inherit_id" ref="event.event_tag_category_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='tag_ids']" position="attributes">
+                <attribute name="widget">many2many_tags</attribute>
+                <attribute name="options">{'color_field': 'color'}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_tag_view_list" model="ir.ui.view">
+        <field name="name">event.tag.view.list.inherit.online</field>
+        <field name="model">event.tag</field>
+        <field name="inherit_id" ref="event.event_tag_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='category_id']" position="after">
+                <field name="color" widget="color_picker"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_tag_view_form" model="ir.ui.view">
+        <field name="name">event.tag.view.form.inherit.online</field>
+        <field name="model">event.tag</field>
+        <field name="inherit_id" ref="event.event_tag_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='category_id']" position="after">
+                <field name="color" widget="color_picker"/>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_online/views/event_templates_event.xml b/addons/website_event_online/views/event_templates_event.xml
new file mode 100644
index 00000000000..6889a092ed1
--- /dev/null
+++ b/addons/website_event_online/views/event_templates_event.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Add Register additional CTA button, in addition to menus -->
+<template id="event_layout_main" inherit_id="website_event.layout">
+    <xpath expr="//div[@id='o_wevent_event_submenu']/ul" position="after">
+        <a t-if="event.menu_register_cta and not event.is_participating"
+            t-att-href="'/event/%s/register' % (slug(event))"
+            class="btn btn-primary ml-auto">
+            Register
+        </a>
+    </xpath>
+</template>
+
+<template id="events_list" inherit_id="website_event.events_list">
+    <xpath expr="//t[@t-foreach='event.tag_ids']/span" position="replace">
+        <span t-attf-class="badge mr8 #{'badge-primary' if tag in search_tags else 'badge-light'}  #{'o_tag_color_%s' % tag.color if tag.color else ''}">
+            <span t-esc="tag.name"/>
+        </span>
+    </xpath>
+</template>
+
+<!-- TDE FIXME: move in a separate file -->
+<template id="display_timer_widget" name="Display Timer Widget">
+    <t t-set="pre_countdown_display" t-value="bool(pre_countdown_text) or pre_countdown_display"/>
+    <t t-set="pre_countdown_time" t-value="datetime.datetime.now().timestamp() + int(pre_remaining_time)"/>
+
+    <div class="o_display_timer"
+         t-att-data-display-class="display_class"
+         t-att-data-main-countdown-time="datetime.datetime.now().timestamp() + int(main_remaining_time)"
+         t-att-data-main-countdown-text="main_countdown_text"
+         t-att-data-main-countdown-display="main_countdown_display"
+         t-att-data-pre-countdown-time="pre_countdown_time"
+         t-att-data-pre-countdown-display="pre_countdown_display"
+         t-att-data-pre-countdown-text="pre_countdown_text">
+        <t t-set="remaining_time" t-value="pre_remaining_time if pre_remaining_time else main_remaining_time"/>
+        <span class="o_display_timer_countdown d-flex justify-content-center">
+            <span class="o_countdown_text pr-1" t-esc="pre_countdown_text if pre_countdown_text else main_countdown_text if not pre_countdown_display else ''"/>
+            <div t-if="int(remaining_time) > 86400"
+             class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_days pr-1">0</span><span class="o_countdown_metric pr-1">days</span></div>
+            <div t-if="int(remaining_time) > 3600"
+                 class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_hours">00</span><span class="o_countdown_metric">:</span></div>
+            <div class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_minutes">00</span><span class="o_countdown_metric">:</span></div>
+            <div class="o_countdown_metric_container"><span class="o_countdown_remaining o_timer_seconds">00</span><span class="o_countdown_metric"></span></div>
+        </span>
+    </div>
+</template>
+
+<template id="registration_template" inherit_id="website_event.registration_template">
+    <xpath expr="//div" position="after">
+        <div t-if="toast_message" class="o_wevent_register_toaster d-none" t-att-data-message="toast_message"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_online/views/event_type_views.xml b/addons/website_event_online/views/event_type_views.xml
new file mode 100644
index 00000000000..b87ae0c0107
--- /dev/null
+++ b/addons/website_event_online/views/event_type_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <record id="event_type_view_form" model="ir.ui.view" >
+        <field name="name">event.type.view.form.inherit.online</field>
+        <field name="model">event.type</field>
+        <field name="inherit_id" ref="event.view_event_type_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='tag_ids']" position="attributes">
+                <attribute name="options">{'color_field': 'color', 'no_quick_create': True}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_online/views/website_visitor_views.xml b/addons/website_event_online/views/website_visitor_views.xml
new file mode 100644
index 00000000000..a7b4af81adf
--- /dev/null
+++ b/addons/website_event_online/views/website_visitor_views.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+   <record id="website_visitor_view_search" model="ir.ui.view">
+        <field name="name">website.visitor.view.search.inherit.event</field>
+        <field name="model">website.visitor</field>
+        <field name="inherit_id" ref="website.website_visitor_view_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='group_by_lang']" position="after">
+                <filter string="Main Contact" name="group_by_parent_id" context="{'group_by': 'parent_id'}"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="website_visitor_view_tree" model="ir.ui.view">
+        <field name="name">website.visitor.view.tree.inherit.event</field>
+        <field name="model">website.visitor</field>
+        <field name="inherit_id" ref="website.website_visitor_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='page_ids']" position="after">
+                <field name="event_registration_count"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="website_visitor_view_form" model="ir.ui.view">
+        <field name="name">website.visitor.view.form.inherit.event</field>
+        <field name="model">website.visitor</field>
+        <field name="inherit_id" ref="website.website_visitor_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@id='w_visitor_visit_counter']" position="before">
+                <button name="%(website_event_online.event_registration_action_from_visitor)d"
+                    type="action"
+                    class="oe_stat_button" icon="fa-ticket"
+                    attrs="{'invisible': [('event_registration_count', '=', 0)]}">
+                    <field name="event_registration_count" widget="statinfo" string="Registrations"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='page_ids']" position="after">
+                <field name="parent_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="website_visitor_view_kanban" model="ir.ui.view">
+        <field name="name">website.visitor.view.kanban.inherit.event</field>
+        <field name="model">website.visitor</field>
+        <field name="inherit_id" ref="website.website_visitor_view_kanban"/>
+        <field name="arch" type="xml">
+            <field name="page_ids" position="after">
+                <field name="event_registration_count"/>
+            </field>
+            <xpath expr="//div[@id='o_page_count']" position="after">
+                <div>Registrations<span class="float-right font-weight-bold"><field name="event_registration_count"/></span></div>
+            </xpath>
+            <xpath expr="//div[hasclass('w_visitor_kanban_actions_ungrouped')]" position="before">
+                <div class="col">
+                    <b><field name="event_registration_count"/></b>
+                    <div>Registrations</div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track/controllers/main.py b/addons/website_event_track/controllers/main.py
index 0fb3d3b6989..7618ecb3998 100644
--- a/addons/website_event_track/controllers/main.py
+++ b/addons/website_event_track/controllers/main.py
@@ -80,7 +80,8 @@ class WebsiteEventTrackController(http.Controller):
         event = event.with_context(tz=event.date_tz or 'UTC')
         local_tz = pytz.timezone(event.date_tz or 'UTC')
         days_tracks = collections.defaultdict(lambda: [])
-        for track in event.track_ids.sorted(lambda track: (bool(track.date), track.date, bool(track.location_id))):
+        event_track_ids = self._event_agenda_get_tracks(event)
+        for track in event_track_ids.sorted(lambda track: (bool(track.date), track.date, bool(track.location_id))):
             if not track.date:
                 continue
             date = fields.Datetime.from_string(track.date).replace(tzinfo=pytz.utc).astimezone(local_tz)
@@ -97,9 +98,13 @@ class WebsiteEventTrackController(http.Controller):
             'main_object': event,
             'days': days,
             'tracks_by_days': tracks_by_days,
-            'tag': tag
+            'tag': tag,
+            'user_event_manager': request.env.user.has_group('event.group_event_manager'),
         })
 
+    def _event_agenda_get_tracks(self, event):
+        return event.track_ids
+
     @http.route([
         '''/event/<model("event.event"):event>/track''',
         '''/event/<model("event.event"):event>/track/tag/<model("event.track.tag"):tag>'''
diff --git a/addons/website_event_track_exhibitor/__init__.py b/addons/website_event_track_exhibitor/__init__.py
new file mode 100644
index 00000000000..5a31f331a2a
--- /dev/null
+++ b/addons/website_event_track_exhibitor/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
+from . import models
+from . import tests
diff --git a/addons/website_event_track_exhibitor/__manifest__.py b/addons/website_event_track_exhibitor/__manifest__.py
new file mode 100644
index 00000000000..9fd2503da71
--- /dev/null
+++ b/addons/website_event_track_exhibitor/__manifest__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Event Exhibitors',
+    'category': 'Marketing/Events',
+    'sequence': 1004,
+    'version': '1.0',
+    'summary': 'Event: upgrade sponsors to exhibitors',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        'website_event_track_online',
+        'website_jitsi',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/security.xml',
+        'views/assets.xml',
+        'views/event_sponsor_views.xml',
+        'views/event_event_views.xml',
+        'views/event_exhibitor_templates_list.xml',
+        'views/event_exhibitor_templates_page.xml',
+        'views/event_type_views.xml',
+    ],
+    'demo': [
+        'data/event_demo.xml',
+        'data/event_sponsor_demo.xml',
+    ],
+    'application': False,
+    'installable': True,
+}
diff --git a/addons/website_event_track_exhibitor/controllers/__init__.py b/addons/website_event_track_exhibitor/controllers/__init__.py
new file mode 100644
index 00000000000..5a5d5a97f79
--- /dev/null
+++ b/addons/website_event_track_exhibitor/controllers/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import exhibitor
+from . import website_event_main
diff --git a/addons/website_event_track_exhibitor/controllers/exhibitor.py b/addons/website_event_track_exhibitor/controllers/exhibitor.py
new file mode 100644
index 00000000000..e07d2b8f5c3
--- /dev/null
+++ b/addons/website_event_track_exhibitor/controllers/exhibitor.py
@@ -0,0 +1,226 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from ast import literal_eval
+from random import randint
+from werkzeug.exceptions import NotFound, Forbidden
+
+from odoo import exceptions, http
+from odoo.addons.website_event_track.controllers.main import WebsiteEventTrackController
+from odoo.http import request
+from odoo.osv import expression
+
+
+class ExhibitorController(WebsiteEventTrackController):
+
+    def _get_event_sponsors_base_domain(self, event):
+        search_domain_base = [
+            ('event_id', '=', event.id),
+            ('is_exhibitor', '=', True),
+        ]
+        if not request.env.user.has_group('event.group_event_user'):
+            search_domain_base = expression.AND([search_domain_base, [('is_published', '=', True)]])
+        return search_domain_base
+
+    # ------------------------------------------------------------
+    # MAIN PAGE
+    # ------------------------------------------------------------
+
+    @http.route(['/event/<model("event.event"):event>/exhibitors'], type='http', auth="public", website=True, sitemap=False)
+    def event_exhibitors(self, event, **searches):
+        if not event.can_access_from_current_website():
+            raise NotFound()
+
+        return request.render(
+            "website_event_track_exhibitor.event_exhibitors",
+            self._event_exhibitors_get_values(event, **searches)
+        )
+
+    def _event_exhibitors_get_values(self, event, **searches):
+        # init and process search terms
+        searches.setdefault('search', '')
+        searches.setdefault('countries', '')
+        searches.setdefault('sponsorships', '')
+        search_domain_base = self._get_event_sponsors_base_domain(event)
+        search_domain = search_domain_base
+
+        # search on content
+        if searches.get('search'):
+            search_domain = expression.AND([
+                search_domain,
+                ['|', ('name', 'ilike', searches['search']), ('website_description', 'ilike', searches['search'])]
+            ])
+
+        # search on countries
+        search_countries = self._get_search_countries(searches['countries'])
+        if search_countries:
+            search_domain = expression.AND([
+                search_domain,
+                [('partner_id.country_id', 'in', search_countries.ids)]
+            ])
+
+        # search on sponsor types
+        search_sponsorships = self._get_search_sponsorships(searches['sponsorships'])
+        if search_sponsorships:
+            search_domain = expression.AND([
+                search_domain,
+                [('sponsor_type_id', 'in', search_sponsorships.ids)]
+            ])
+
+        # fetch data to display; use sudo to allow reading partner info, be sure domain is correct
+        event = event.with_context(tz=event.date_tz or 'UTC')
+        sponsors = request.env['event.sponsor'].sudo().search(search_domain)
+        sponsors_all = request.env['event.sponsor'].sudo().search(search_domain_base)
+        sponsor_types = sponsors_all.mapped('sponsor_type_id')
+        sponsor_countries = sponsors_all.mapped('partner_id.country_id')
+        # organize sponsors into categories to help display
+        sponsor_categories = dict()
+        for sponsor in sponsors:
+            if not sponsor_categories.get(sponsor.sponsor_type_id):
+                sponsor_categories[sponsor.sponsor_type_id] = request.env['event.sponsor'].sudo()
+            sponsor_categories[sponsor.sponsor_type_id] |= sponsor
+        sponsor_categories = [
+            dict({
+                'sponsorship': sponsor_category,
+                'sponsors': sponsors,
+            }) for sponsor_category, sponsors in sponsor_categories.items()]
+
+        # return rendering values
+        return {
+            # event information
+            'event': event,
+            'main_object': event,
+            'sponsor_categories': sponsor_categories,
+            'hide_sponsors': True,
+            # search information
+            'searches': searches,
+            'search_key': searches['search'],
+            'search_countries': search_countries,
+            'search_sponsorships': search_sponsorships,
+            'sponsor_types': sponsor_types,
+            'sponsor_countries': sponsor_countries,
+            # environment
+            'hostname': request.httprequest.host.split(':')[0],
+            'user_event_manager': request.env.user.has_group('event.group_event_manager'),
+        }
+
+    # ------------------------------------------------------------
+    # FRONTEND FORM
+    # ------------------------------------------------------------
+
+    @http.route(['/event/<model("event.event"):event>/exhibitor/<model("event.sponsor"):sponsor>'], type='http', auth="public", website=True, sitemap=False)
+    def event_exhibitor(self, event, sponsor, **options):
+        if not event.can_access_from_current_website():
+            raise NotFound()
+
+        try:
+            sponsor.check_access_rule('read')
+        except exceptions.AccessError:
+            raise Forbidden()
+        sponsor = sponsor.sudo()
+
+        if 'widescreen' not in options and sponsor.chat_room_id and sponsor.is_in_opening_hours:
+            options['widescreen'] = True
+
+        return request.render(
+            "website_event_track_exhibitor.event_exhibitor_main",
+            self._event_exhibitor_get_values(event, sponsor, **options)
+        )
+
+    def _event_exhibitor_get_values(self, event, sponsor, **options):
+        # search for exhibitor list
+        search_domain_base = self._get_event_sponsors_base_domain(event)
+        search_domain_base = expression.AND([
+            search_domain_base,
+            [('id', '!=', sponsor.id)]
+        ])
+        sponsors_other = request.env['event.sponsor'].sudo().search(search_domain_base)
+        sponsors_other = sponsors_other.filtered(lambda sponsor: sponsor.is_in_opening_hours)
+        current_country = sponsor.partner_id.country_id
+
+        sponsors_other = sponsors_other.sorted(key=lambda sponsor: (
+            sponsor.partner_id.country_id == current_country,
+            -1 * sponsor.sponsor_type_id.sequence,
+            randint(0, 20)
+        ), reverse=True)
+
+        option_widescreen = options.get('widescreen', False)
+        option_widescreen = bool(option_widescreen) if option_widescreen != '0' else False
+
+        return {
+            # event information
+            'event': event,
+            'main_object': sponsor,
+            'sponsor': sponsor,
+            'hide_sponsors': True,
+            # sidebar
+            'sponsors_other': sponsors_other,
+            # options
+            'option_widescreen': option_widescreen,
+            'option_can_edit': request.env.user.has_group('event.group_event_manager'),
+            # environment
+            'hostname': request.httprequest.host.split(':')[0],
+            'user_event_manager': request.env.user.has_group('event.group_event_manager'),
+        }
+
+    # ------------------------------------------------------------
+    # BUSINESS / MISC
+    # ------------------------------------------------------------
+
+    @http.route('/event_sponsor/<int:sponsor_id>/read', type='json', auth='public', website=True)
+    def event_sponsor_read(self, sponsor_id):
+        """ Marshmalling data for "event not started / sponsor not available" modal """
+        sponsor = request.env['event.sponsor'].browse(sponsor_id)
+        sponsor_data = sponsor.read([
+            'name', 'subtitle',
+            'url', 'email', 'phone',
+            'website_description', 'website_image_url',
+            'hour_from', 'hour_to', 'is_in_opening_hours',
+            'event_date_tz', 'country_flag_url',
+        ])[0]
+        if sponsor.country_id:
+            sponsor_data['country_name'] = sponsor.country_id.name
+            sponsor_data['country_id'] = sponsor.country_id.id
+        else:
+            sponsor_data['country_name'] = False
+            sponsor_data['country_id'] = False
+        if sponsor.sponsor_type_id:
+            sponsor_data['sponsor_type_name'] = sponsor.sponsor_type_id.name
+            sponsor_data['sponsor_type_id'] = sponsor.sponsor_type_id.id
+        else:
+            sponsor_data['sponsor_type_name'] = False
+            sponsor_data['sponsor_type_id'] = False
+        sponsor_data['event_name'] = sponsor.event_id.name
+        sponsor_data['event_is_ongoing'] = sponsor.event_id.is_ongoing
+        sponsor_data['event_start_today'] = sponsor.event_id.start_today
+        sponsor_data['event_start_remaining'] = sponsor.event_id.start_remaining
+        sponsor_data['event_date_begin_located'] = sponsor.event_id.date_begin_located
+        sponsor_data['event_date_end_located'] = sponsor.event_id.date_end_located
+
+        return sponsor_data
+
+    # ------------------------------------------------------------
+    # TOOLS
+    # ------------------------------------------------------------
+
+    def _get_search_countries(self, country_search):
+        # TDE FIXME: make me generic (slides, event, ...)
+        try:
+            country_ids = literal_eval(country_search)
+        except Exception:
+            countries = request.env['res.country'].sudo()
+        else:
+            # perform a search to filter on existing / valid tags implicitly
+            countries = request.env['res.country'].sudo().search([('id', 'in', country_ids)])
+        return countries
+
+    def _get_search_sponsorships(self, sponsorship_search):
+        # TDE FIXME: make me generic (slides, event, ...)
+        try:
+            sponsorship_ids = literal_eval(sponsorship_search)
+        except Exception:
+            sponsorships = request.env['event.sponsor.type'].sudo()
+        else:
+            # perform a search to filter on existing / valid tags implicitly
+            sponsorships = request.env['event.sponsor.type'].sudo().search([('id', 'in', sponsorship_ids)])
+        return sponsorships
diff --git a/addons/website_event_track_exhibitor/controllers/website_event_main.py b/addons/website_event_track_exhibitor/controllers/website_event_main.py
new file mode 100644
index 00000000000..66c663e7977
--- /dev/null
+++ b/addons/website_event_track_exhibitor/controllers/website_event_main.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from babel.dates import format_datetime
+
+from odoo import _
+from odoo.http import request
+from odoo.addons.website_event.controllers.main import WebsiteEventController
+
+
+class WebsiteEventController(WebsiteEventController):
+    def _prepare_event_register_values(self, event, **post):
+        values = super(WebsiteEventController, self)._prepare_event_register_values(event, **post)
+
+        if "from_sponsor_id" in post and not event.is_ongoing:
+            sponsor = request.env["event.sponsor"].browse(int(post["from_sponsor_id"])).exists()
+            if sponsor:
+                date_begin = format_datetime(event.with_context(tz=event.date_tz).date_begin, format="medium")
+
+                values["toast_message"] = (
+                    _('The event %s starts at %s (%s). \nJoin us there to meet %s !')
+                    % (event.name, date_begin, event.date_tz, sponsor.partner_name)
+                )
+
+        return values
diff --git a/addons/website_event_track_exhibitor/data/event_demo.xml b/addons/website_event_track_exhibitor/data/event_demo.xml
new file mode 100644
index 00000000000..fdcc32bdc0e
--- /dev/null
+++ b/addons/website_event_track_exhibitor/data/event_demo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="event.event_7" model="event.event">
+        <field name="exhibitor_menu" eval="True"/>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_exhibitor/data/event_sponsor_demo.xml b/addons/website_event_track_exhibitor/data/event_sponsor_demo.xml
new file mode 100644
index 00000000000..f7e5726452b
--- /dev/null
+++ b/addons/website_event_track_exhibitor/data/event_sponsor_demo.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="website_event_track.event_7_sponsor_0" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">Catchy sentence !</field>
+        <field name="is_exhibitor" eval="False"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_1" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">You won't believe this sponsor</field>
+        <field name="is_exhibitor" eval="False"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_2" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">Honestly we are good</field>
+        <field name="is_exhibitor" eval="True"/>
+        <field name="room_name">gemini-furniture</field>
+        <field name="room_max_capacity">12</field>
+    </record>
+    <record id="website_event_track.event_7_sponsor_3" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">Catchy sentence !</field>
+        <field name="is_exhibitor" eval="True"/>
+        <field name="room_name">ready-mat</field>
+        <field name="room_max_capacity">12</field>
+    </record>
+    <record id="website_event_track.event_7_sponsor_4" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">You won't believe this sponsor</field>
+        <field name="is_exhibitor" eval="True"/>
+        <field name="room_name">the-jackson-group</field>
+        <field name="room_max_capacity">12</field>
+    </record>
+    <record id="website_event_track.event_7_sponsor_5" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">Honestly we are good</field>
+        <field name="is_exhibitor" eval="True"/>
+        <field name="room_name">azure-interior</field>
+        <field name="room_max_capacity">12</field>
+    </record>
+    <record id="website_event_track.event_7_sponsor_6" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">You won't believe this sponsor</field>
+        <field name="is_exhibitor" eval="True"/>
+        <field name="room_name">bloem-flower</field>
+        <field name="room_max_capacity">12</field>
+    </record>
+    <record id="website_event_track.event_7_sponsor_7" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">Honestly we are good</field>
+        <field name="is_exhibitor" eval="True"/>
+        <field name="room_name">open-wood</field>
+        <field name="room_max_capacity">12</field>
+    </record>
+    <record id="website_event_track.event_7_sponsor_8" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">You won't believe this sponsor</field>
+        <field name="is_exhibitor" eval="True"/>
+        <field name="room_name">tree-dealers</field>
+        <field name="room_max_capacity">12</field>
+    </record>
+    <record id="website_event_track.event_7_sponsor_9" model="event.sponsor">
+        <field name="is_published" eval="True"/>
+        <field name="subtitle">Honestly we are good</field>
+        <field name="is_exhibitor" eval="True"/>
+        <field name="room_name">pterocarpus</field>
+        <field name="room_max_capacity">12</field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_exhibitor/models/__init__.py b/addons/website_event_track_exhibitor/models/__init__.py
new file mode 100644
index 00000000000..65b747dd5bb
--- /dev/null
+++ b/addons/website_event_track_exhibitor/models/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_event
+from . import event_sponsor
+from . import event_type
+from . import website_event_menu
diff --git a/addons/website_event_track_exhibitor/models/event_event.py b/addons/website_event_track_exhibitor/models/event_event.py
new file mode 100644
index 00000000000..49081272586
--- /dev/null
+++ b/addons/website_event_track_exhibitor/models/event_event.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.addons.http_routing.models.ir_http import slug
+
+
+class EventEvent(models.Model):
+    _inherit = "event.event"
+
+    exhibitor_menu = fields.Boolean(
+        string='Showcase Exhibitors', compute='_compute_exhibitor_menu',
+        readonly=False, store=True)
+    exhibitor_menu_ids = fields.One2many(
+        'website.event.menu', 'event_id', string='Exhibitors Menus',
+        domain=[('menu_type', '=', 'exhibitor')])
+
+    @api.depends('event_type_id', 'website_menu', 'exhibitor_menu')
+    def _compute_exhibitor_menu(self):
+        for event in self:
+            if event.event_type_id and event.event_type_id != event._origin.event_type_id:
+                event.exhibitor_menu = event.event_type_id.exhibitor_menu
+            elif event.website_menu and event.website_menu != event._origin.website_menu or not event.exhibitor_menu:
+                event.exhibitor_menu = True
+            elif not event.website_menu:
+                event.exhibitor_menu = False
+
+    # ------------------------------------------------------------
+    # WEBSITE MENU MANAGEMENT
+    # ------------------------------------------------------------
+
+    def toggle_exhibitor_menu(self, val):
+        self.exhibitor_menu = val
+
+    def _get_menu_update_fields(self):
+        return super(EventEvent, self)._get_menu_update_fields() + ['exhibitor_menu']
+
+    def _update_website_menus(self, menus_update_by_field=None):
+        super(EventEvent, self)._update_website_menus(menus_update_by_field=menus_update_by_field)
+        for event in self:
+            if not menus_update_by_field or event in menus_update_by_field.get('exhibitor_menu'):
+                event._update_website_menu_entry('exhibitor_menu', 'exhibitor_menu_ids', '_get_exhibitor_menu_entries')
+
+    def _get_menu_type_field_matching(self):
+        res = super(EventEvent, self)._get_menu_type_field_matching()
+        res['exhibitor'] = 'exhibitor_menu'
+        return res
+
+    def _get_exhibitor_menu_entries(self):
+        self.ensure_one()
+        return [(_('Exhibitors'), '/event/%s/exhibitors' % slug(self), False, 60, 'exhibitor')]
diff --git a/addons/website_event_track_exhibitor/models/event_sponsor.py b/addons/website_event_track_exhibitor/models/event_sponsor.py
new file mode 100644
index 00000000000..1f91250377d
--- /dev/null
+++ b/addons/website_event_track_exhibitor/models/event_sponsor.py
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from datetime import datetime
+from pytz import timezone, utc
+
+from odoo import api, fields, models
+from odoo.addons.http_routing.models.ir_http import slug
+from odoo.addons.resource.models.resource import float_to_time
+from odoo.tools import is_html_empty
+from odoo.tools.translate import html_translate
+
+
+class EventSponsor(models.Model):
+    _name = 'event.sponsor'
+    _inherit = [
+        'event.sponsor',
+        'website.published.mixin',
+        'chat.room.mixin',
+    ]
+    _rec_name = 'name'
+    _order = 'sponsor_type_id, sequence'
+
+    # description
+    subtitle = fields.Char('Slogan', help='Catchy marketing sentence for promote')
+    is_exhibitor = fields.Boolean("Exhibitor's Chat")
+    website_description = fields.Html(
+        'Description', compute='_compute_website_description',
+        sanitize_attributes=False, sanitize_form=True, translate=html_translate,
+        readonly=False, store=True)
+    # live mode
+    hour_from = fields.Float('Opening hour', default=8.0)
+    hour_to = fields.Float('End hour', default=18.0)
+    event_date_tz = fields.Selection(string='Timezone', related='event_id.date_tz', readonly=True)
+    is_in_opening_hours = fields.Boolean(
+        'Within opening hours', compute='_compute_is_in_opening_hours')
+    # chat room
+    chat_room_id = fields.Many2one(readonly=False)
+    room_name = fields.Char(readonly=False)
+    # country information (related to ease frontend templates)
+    country_id = fields.Many2one(
+        'res.country', string='Country',
+        related='partner_id.country_id', readonly=True)
+    country_flag_url = fields.Char(
+        string='Country Flag',
+        compute='_compute_country_flag_url', compute_sudo=True)
+
+    @api.onchange('is_exhibitor')
+    def _onchange_is_exhibitor(self):
+        """ Keep an explicit onchange to allow configuration of room names, even
+        if this field is normally a related on chat_room_id.name. It is not a real
+        computed field, an onchange used in form view is sufficient. """
+        for sponsor in self:
+            if sponsor.is_exhibitor and not sponsor.room_name:
+                if sponsor.name:
+                    sponsor.room_name = self.env['chat.room']._jitsi_sanitize_name("odoo-exhibitor-%s" % sponsor.name)
+                else:
+                    sponsor.room_name = self.env['chat.room']._default_name()
+
+    @api.depends('partner_id')
+    def _compute_website_description(self):
+        for sponsor in self:
+            if is_html_empty(sponsor.website_description):
+                sponsor.website_description = sponsor.partner_id.website_description
+
+    @api.depends('event_id.is_ongoing', 'hour_from', 'hour_to', 'event_id.date_begin', 'event_id.date_end')
+    def _compute_is_in_opening_hours(self):
+        """ Opening hours: hour_from and hour_to are given within event TZ or UTC.
+        Now() must therefore be computed based on that TZ. """
+        for sponsor in self:
+            if not sponsor.event_id.is_ongoing:
+                sponsor.is_in_opening_hours = False
+            elif not sponsor.hour_from or not sponsor.hour_to:
+                sponsor.is_in_opening_hours = True
+            else:
+                event_tz = timezone(sponsor.event_id.date_tz)
+                # localize now, begin and end datetimes in event tz
+                dt_begin = sponsor.event_id.date_begin.astimezone(event_tz)
+                dt_end = sponsor.event_id.date_end.astimezone(event_tz)
+                now_utc = utc.localize(fields.Datetime.now().replace(microsecond=0))
+                now_tz = now_utc.astimezone(event_tz)
+
+                # compute opening hours
+                opening_from_tz = event_tz.localize(datetime.combine(now_tz.date(), float_to_time(sponsor.hour_from)))
+                opening_to_tz = event_tz.localize(datetime.combine(now_tz.date(), float_to_time(sponsor.hour_to)))
+
+                opening_from = max([dt_begin, opening_from_tz])
+                opening_to = min([dt_end, opening_to_tz])
+
+                sponsor.is_in_opening_hours = opening_from <= now_tz < opening_to
+
+    @api.depends('partner_id.country_id.image')
+    def _compute_country_flag_url(self):
+        for sponsor in self:
+            if sponsor.partner_id.country_id:
+                sponsor.country_flag_url = self.env['website'].image_url(sponsor.partner_id.country_id, 'image', size=256)
+            else:
+                sponsor.country_flag_url = False
+
+    @api.depends('name', 'event_id.name')
+    def _compute_website_url(self):
+        super(EventSponsor, self)._compute_website_url()
+        for sponsor in self:
+            if sponsor.id:  # avoid to perform a slug on a not yet saved record in case of an onchange.
+                base_url = sponsor.event_id.get_base_url()
+                sponsor.website_url = '%s/event/%s/exhibitor/%s' % (base_url, slug(sponsor.event_id), slug(sponsor))
+
+    @api.model_create_multi
+    def create(self, values_list):
+        for values in values_list:
+            if values.get('is_exhibitor') and not values.get('room_name'):
+                name = values['name'] if values.get('name') else self.env['res.partner'].browse(values['partner_id']).name or 'sponsor'
+                values['room_name'] = self.env['chat.room']._jitsi_sanitize_name(name)
+        return super(EventSponsor, self).create(values_list)
+
+    def get_backend_menu_id(self):
+        return self.env.ref('event.event_main_menu').id
diff --git a/addons/website_event_track_exhibitor/models/event_type.py b/addons/website_event_track_exhibitor/models/event_type.py
new file mode 100644
index 00000000000..0aaa96600e6
--- /dev/null
+++ b/addons/website_event_track_exhibitor/models/event_type.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class EventType(models.Model):
+    _inherit = "event.type"
+
+    exhibitor_menu = fields.Boolean(
+        string='Showcase Exhibitors', compute='_compute_exhibitor_menu',
+        readonly=False, store=True,
+        help='Display exhibitors on website')
+
+    @api.depends('website_menu')
+    def _compute_exhibitor_menu(self):
+        for event_type in self:
+            event_type.exhibitor_menu = event_type.website_menu
diff --git a/addons/website_event_track_exhibitor/models/website_event_menu.py b/addons/website_event_track_exhibitor/models/website_event_menu.py
new file mode 100644
index 00000000000..ce37fadbbf5
--- /dev/null
+++ b/addons/website_event_track_exhibitor/models/website_event_menu.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class EventMenu(models.Model):
+    _inherit = "website.event.menu"
+
+    menu_type = fields.Selection(selection_add=[('exhibitor', 'Exhibitors Menus')])
diff --git a/addons/website_event_track_exhibitor/security/ir.model.access.csv b/addons/website_event_track_exhibitor/security/ir.model.access.csv
new file mode 100644
index 00000000000..e897683cd40
--- /dev/null
+++ b/addons/website_event_track_exhibitor/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+chat_room_access_event_manager,chat.room.access.event.manager,website_jitsi.model_chat_room,event.group_event_manager,1,1,1,1
diff --git a/addons/website_event_track_exhibitor/security/security.xml b/addons/website_event_track_exhibitor/security/security.xml
new file mode 100644
index 00000000000..d49bf7aa729
--- /dev/null
+++ b/addons/website_event_track_exhibitor/security/security.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="event_sponsor_rule_share" model="ir.rule">
+        <field name="name">Event Sponsor: public/portal published only</field>
+        <field name="model_id" ref="website_event_track.model_event_sponsor"/>
+        <field name="domain_force">[('website_published', '=', True)]</field>
+        <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="False"/>
+        <field name="perm_create" eval="False"/>
+        <field name="perm_unlink" eval="False"/>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_exhibitor/static/src/js/event_exhibitor_connect.js b/addons/website_event_track_exhibitor/static/src/js/event_exhibitor_connect.js
new file mode 100644
index 00000000000..eb0c12fd9fa
--- /dev/null
+++ b/addons/website_event_track_exhibitor/static/src/js/event_exhibitor_connect.js
@@ -0,0 +1,137 @@
+odoo.define('website_event_track_exhibitor.event_exhibitor_connect', function (require) {
+'use strict';
+
+var Dialog = require('web.Dialog');
+var publicWidget = require('web.public.widget');
+
+var ExhibitorConnectClosedDialog = Dialog.extend({
+    events: _.extend({}, Dialog.prototype.events, {
+        'click .o_wesponsor_js_connect_modal_contry': '_onClickCountryFlag',
+    }),
+    template: 'exhibitor.connect.closed.modal',
+
+    /**
+     * @override
+     * @param {Object} parent;
+     * @param {Object} options holding a sponsorData obj with required values to
+     *   display (see .xml for details);
+     */
+    init: function (parent, options) {
+        options = _.defaults(options || {}, {
+            size: 'medium',
+            renderHeader: false,
+            renderFooter: false,
+            backdrop: true,
+        });
+        this.sponsorId = options.sponsorId;
+        this._super(parent, options);
+    },
+
+    /**
+     * @override
+     * Wait for fetching sponsor data;
+     */
+    willStart: function () {
+        return Promise.all([
+            this._super(...arguments),
+            this._fetchSponsor()
+        ]);
+    },
+
+    //---------------------------------------------------------------------
+    // Private
+    //---------------------------------------------------------------------
+
+    /**
+     * @private
+     * @returns {Promise<*>} promise after fetching sponsor data, given its
+     *   sponsorId. Necessary to render template content;
+     */
+    _fetchSponsor: function () {
+        let self = this;
+        let rpcPromise = this._rpc({
+            route: `/event_sponsor/${this.sponsorId}/read`,
+        }).then(function (readData) {
+            self.sponsorData = readData;
+            return Promise.resolve();
+        });
+        return rpcPromise;
+    },
+});
+
+
+publicWidget.registry.eventExhibitorConnect = publicWidget.Widget.extend({
+    selector: '.o_wesponsor_js_connect',
+    xmlDependencies: ['/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml'],
+
+    /**
+     * @override
+     * @public
+     */
+    init: function () {
+        this._super(...arguments);
+        this._onConnectClick = _.debounce(this._onConnectClick, 500, true);
+    },
+
+    /**
+     * @override
+     * @public
+     */
+    start: function () {
+        var self = this;
+        return this._super(...arguments).then(function () {
+            self.eventIsOngoing = self.$el.data('eventIsOngoing') || false;
+            self.sponsorIsOngoing = self.$el.data('sponsorIsOngoing') || false;
+            self.isParticipating = self.$el.data('isParticipating') || false;
+            self.userEventManager = self.$el.data('userEventManager') || false;
+            self.$el.on('click', self._onConnectClick.bind(self));
+        });
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //-------------------------------------------------------------------------
+
+    /**
+     * @private
+     * @param {Event} ev
+     * On click, if sponsor is not within opening hours, display a modal instead
+     * of redirecting on the sponsor view;
+     */
+    _onConnectClick: function (ev) {
+        ev.stopPropagation();
+        ev.preventDefault();
+
+        if (this.userEventManager) {
+            document.location = this.$el.data('sponsorUrl');
+        } else if (!this.eventIsOngoing && !this.isParticipating) {
+            document.location = this.$el.data('registerUrl');
+        } else if (!this.eventIsOngoing || ! this.sponsorIsOngoing) {
+            return this._openClosedDialog();
+        } else {
+            document.location = this.$el.data('sponsorUrl');
+        }
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _openClosedDialog: function ($element) {
+        const sponsorId = this.$el.data('sponsorId');
+        return new ExhibitorConnectClosedDialog(
+            this, {
+                sponsorId: sponsorId,
+            }
+        ).open();
+    },
+
+});
+
+
+return {
+    ExhibitorConnectClosedDialog: ExhibitorConnectClosedDialog,
+    eventExhibitorConnect: publicWidget.registry.eventExhibitorConnect,
+};
+
+});
diff --git a/addons/website_event_track_exhibitor/static/src/scss/event_exhibitor_templates.scss b/addons/website_event_track_exhibitor/static/src/scss/event_exhibitor_templates.scss
new file mode 100644
index 00000000000..3458877876f
--- /dev/null
+++ b/addons/website_event_track_exhibitor/static/src/scss/event_exhibitor_templates.scss
@@ -0,0 +1,103 @@
+.o_wevent_hide_sponsors .container.mt32.mb16.d-print-none {
+    // Not a very accurate way to target the 'sponsors' block -> improve in master
+    display: none;
+}
+
+.o_wesponsor_index {
+
+    /*
+     * COMMON
+     */
+
+    .o_wesponsor_gradient {
+        background-image: linear-gradient(120deg, #875A7B, darken(#875A7B, 10%));
+        opacity: 0.8;
+    }
+
+    /*
+     * MAIN PAGE: LIST
+     */
+
+    // Sponsor card
+    .o_wesponsor_card {
+        .card-body {
+            padding: 1rem;
+        }
+
+        .card-footer {
+            padding: 0.75rem 1rem;
+        }
+
+        .o_wesponsor_card_header_badge {
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+            padding: $card-spacer-y $card-spacer-x;
+            text-align: right;
+        }
+        &.o_wesponsor_card_unpublished {
+            opacity: 0.8;
+        }
+
+        .o_wesponsor_bg_image {
+            background-size: contain;
+            background-repeat: no-repeat;
+            background-position:center;
+        }
+
+        // Display connect block on hover on large devices only
+        .o_wesponsor_connect_button {
+            z-index: 1;
+            position: absolute !important;
+            right: 0;
+            top: 0;
+            padding-top: 30%;
+            margin-left: auto;
+            margin-right: auto;
+            width: 100%;
+            height: 100%;
+            text-align: center;
+            background-color: rgba(0,0,0,0);
+
+            a {
+                display: none;
+            }
+        }
+
+        @include media-breakpoint-up(md) {
+            :hover .o_wesponsor_connect_button {
+                cursor: pointer;
+                transition: background-color .2s linear;
+                background-color: rgba(0,0,0,.1);
+
+                a {
+                    display: inline-block;
+                }
+            }
+        }
+    }
+
+    /*
+     * EXHIBITOR PAGE
+     */
+
+    .o_wevent_online_page_container {
+
+        // Jitsi container
+        #o_wsponsor_jitsi_iframe {
+            height: 85vh;
+        }
+
+        .o_wesponsor_exhibitor_aside {
+            .o_wesponsor_sponsor_name {
+                line-height: 1rem;
+            }
+
+            .o_wesponsor_aside_logo {
+                max-width: 40px;
+                object-fit: contain;
+                object-position: top;
+            }
+        }
+    }
+}
diff --git a/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml b/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml
new file mode 100644
index 00000000000..31979df4de8
--- /dev/null
+++ b/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="exhibitor.connect.closed.modal">
+        <div class="o_wesponsor_js_connect_modal_main container">
+            <div class="row mt-2">
+                <div class="col-12 alert alert-warning text-center" role="alert"
+                    t-if="! widget.sponsorData.event_is_ongoing">
+                    <span t-esc="widget.sponsorData.name" class="font-weight-bold"/> is not available right now.<br />
+                    Event <span t-esc="widget.sponsorData.event_name" class="font-weight-bold"/>
+                    <span t-if="widget.sponsorData.event_start_today">
+                        starts in
+                        <span t-esc="widget.sponsorData.event_start_remaining"/> minutes
+                    </span>
+                    <span class="my-0" t-else="">
+                        starts at <span t-esc="widget.sponsorData.event_date_begin_located"/>
+                    </span>
+                </div>
+                <div class="col-12 alert alert-warning text-center" role="alert"
+                    t-else="">
+                    <span t-esc="widget.sponsorData.name" class="font-weight-bold"/> is not available right now.<br />
+                    Come back between
+                    <strong>
+                        <t t-esc="widget.sponsorData.hour_from" t-options="{'widget': 'float_time'}"/>
+                        -
+                        <t t-esc="widget.sponsorData.hour_to" t-options="{'widget': 'float_time'}"/>
+                    </strong> (<span t-esc="widget.sponsorData.event_date_tz"/>)
+                    to meet them !
+                </div>
+                <div class="col-2">
+                    <img class="img" style="max-width: 100%;"
+                        t-att-src="widget.sponsorData.website_image_url"
+                        t-att-alt="widget.sponsorData.name"/>
+                </div>
+                <div class="col-10">
+                    <div class="d-flex align-items-top mb-3">
+                        <div class="d-flex flex-column">
+                            <div class="d-flex align-items-center">
+                                <h4 t-esc="widget.sponsorData.name" class="mb4"/>
+                                <span class="badge badge-primary ml-2"
+                                    t-esc="widget.sponsorData.sponsor_type_name"/>
+                            </div>
+                            <span class="text-muted" t-if="widget.sponsorData.subtitle" t-esc="widget.sponsorData.subtitle"/>
+                            <span t-if="widget.sponsorData.url">
+                                <i class="fa fa-home mr-2"/><a t-att-href="widget.sponsorData.url"><span t-esc="widget.sponsorData.url"/></a>
+                            </span>
+                            <span t-if="widget.sponsorData.email">
+                                <i class="fa fa-envelope mr-2"/><a t-att-mailto="widget.sponsorData.email"><span t-esc="widget.sponsorData.email"/></a>
+                            </span>
+                            <span t-if="widget.sponsorData.phone">
+                                <i class="fa fa-phone mr-2"/><span t-esc="widget.sponsorData.phone"/>
+                            </span>
+                        </div>
+                        <img class="img ml-auto"
+                            style="max-height: 36px;"
+                            t-att-src="widget.sponsorData.country_flag_url"
+                            t-att-alt="widget.sponsorData.country_name"/>
+                    </div>
+                </div>
+                <span class="col-12" t-if="widget.sponsorData.website_description" t-raw="widget.sponsorData.website_description"/>
+            </div>
+            <div>
+            </div>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/website_event_track_exhibitor/tests/__init__.py b/addons/website_event_track_exhibitor/tests/__init__.py
new file mode 100644
index 00000000000..9ec226b64d9
--- /dev/null
+++ b/addons/website_event_track_exhibitor/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_sponsor_internals
diff --git a/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py b/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py
new file mode 100644
index 00000000000..7856eb8e091
--- /dev/null
+++ b/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from datetime import date, datetime, timedelta
+
+from odoo.addons.website_event_track_online.tests.common import TestEventTrackOnlineCommon
+from odoo.tests.common import users
+
+
+class TestSponsorData(TestEventTrackOnlineCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestSponsorData, cls).setUpClass()
+
+        cls.sponsor_0.write({
+            'hour_from': 8.0,
+            'hour_to': 18.0,
+        })
+
+    @users('user_eventmanager')
+    def test_event_date_computation(self):
+        """ Test date computation. Pay attention that mocks returns UTC values, meaning
+        we have to take into account Europe/Brussels offset """
+        event = self.env['event.event'].browse(self.event_0.id)
+        sponsor = self.env['event.sponsor'].browse(self.sponsor_0.id)
+        event.invalidate_cache(fnames=['is_ongoing'])
+        self.assertTrue(sponsor.is_in_opening_hours)
+        self.assertTrue(event.is_ongoing)
+
+        # After hour_from (9 > 8)
+        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 6, 7, 0, 0)
+        event.invalidate_cache(fnames=['is_ongoing'])
+        sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
+        self.assertTrue(sponsor.is_in_opening_hours)
+        self.assertTrue(event.is_ongoing)
+
+        # At hour_from (8 = 8)
+        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 6, 6, 0, 0)
+        event.invalidate_cache(fnames=['is_ongoing'])
+        sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
+        self.assertTrue(sponsor.is_in_opening_hours)
+        self.assertTrue(event.is_ongoing)
+
+        # Started but not opened (7h59 < 8)
+        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 6, 5, 59, 59)
+        event.invalidate_cache(fnames=['is_ongoing'])
+        sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
+        self.assertFalse(sponsor.is_in_opening_hours)
+        self.assertTrue(event.is_ongoing)
+
+        # Evening event is not in opening hours (20 > 18)
+        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 6, 18, 0, 0)
+        event.invalidate_cache(fnames=['is_ongoing'])
+        sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
+        self.assertFalse(sponsor.is_in_opening_hours)
+        self.assertTrue(event.is_ongoing)
+
+        # First day begins later
+        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 5, 6, 30, 0)
+        event.invalidate_cache(fnames=['is_ongoing'])
+        sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
+        self.assertFalse(sponsor.is_in_opening_hours)
+        self.assertFalse(event.is_ongoing)
+
+        # End day finished sooner
+        self.mock_event_online_dt.now.return_value = datetime(2020, 7, 7, 13, 0, 1)
+        event.invalidate_cache(fnames=['is_ongoing'])
+        sponsor.invalidate_cache(fnames=['is_in_opening_hours'])
+        self.assertFalse(sponsor.is_in_opening_hours)
+        self.assertFalse(event.is_ongoing)
diff --git a/addons/website_event_track_exhibitor/views/assets.xml b/addons/website_event_track_exhibitor/views/assets.xml
new file mode 100644
index 00000000000..fdf90f4446f
--- /dev/null
+++ b/addons/website_event_track_exhibitor/views/assets.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Exhibitor Assets Frontend">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website_event_track_exhibitor/static/src/scss/event_exhibitor_templates.scss"/>
+    </xpath>
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_event_track_exhibitor/static/src/js/event_exhibitor_connect.js"></script>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_exhibitor/views/event_event_views.xml b/addons/website_event_track_exhibitor/views/event_event_views.xml
new file mode 100644
index 00000000000..ff33ca4d6a8
--- /dev/null
+++ b/addons/website_event_track_exhibitor/views/event_event_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="event_event_view_form" model="ir.ui.view">
+        <field name="name">event.event.view.form.inherit.exhibitor</field>
+        <field name="inherit_id" ref="website_event_track_online.event_event_view_form"/>
+        <field name="model">event.event</field>
+        <field name="priority" eval="3"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='website_track_proposal']" position="after">
+                <label for="exhibitor_menu"/>
+                <field name="exhibitor_menu"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_event_track_exhibitor/views/event_exhibitor_templates_list.xml b/addons/website_event_track_exhibitor/views/event_exhibitor_templates_list.xml
new file mode 100644
index 00000000000..373a017c82a
--- /dev/null
+++ b/addons/website_event_track_exhibitor/views/event_exhibitor_templates_list.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_layout" inherit_id="website_event.layout">
+    <xpath expr="//div[@id='wrap']" position="attributes">
+        <attribute name="t-attf-class">o_wevent_event js_event #{'o_wevent_hide_sponsors' if hide_sponsors else ''}</attribute>
+    </xpath>
+</template>
+
+<template id="event_exhibitors" name="Event Exhibitors">
+    <t t-call="website_event.layout">
+        <div class="o_wevent_online o_wevent_online_bg o_wesponsor_index">
+            <!-- Topbar -->
+            <t t-call="website_event_track_exhibitor.exhibitors_topbar"/>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wesponsor_index_1" class="oe_structure"/>
+            <!-- Content -->
+            <div class="o_wesponsor_container container">
+                <div class="row">
+                    <t t-call="website_event_track_exhibitor.exhibitors_search"/>
+                </div>
+                <div class="row">
+                    <t t-call="website_event_track_exhibitor.exhibitors_main"/>
+                </div>
+            </div>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wesponsor_index_2" class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+<!-- ============================================================ -->
+<!-- TOPBAR: BASE NAVIGATION -->
+<!-- ============================================================ -->
+
+<!-- TOPBAR: BASE NAVIGATION -->
+
+<!-- Main topbar -->
+<template id="exhibitors_topbar"
+    name="Exhibitor Tools">
+    <nav class="navbar navbar-light border-top shadow-sm d-print-none">
+        <div class="container">
+            <div class="d-flex flex-column flex-sm-row justify-content-between w-100">
+                <ul class="o_wesponsor_topbar_filters o_wevent_index_topbar_filters nav"/>
+                <div class="d-flex align-items-center flex-wrap pl-sm-3 pr-0">
+                    <t t-call="website_event.events_search_box">
+                        <t t-set="_searches" t-value="searches"/>
+                        <t t-set="action" t-value="'/event/%s/exhibitors' % (slug(event))"/>
+                        <t t-set="_placeholder" t-value="'Search an exhibitor ...'"/>
+                    </t>
+                </div>
+            </div>
+        </div>
+    </nav>
+</template>
+
+<!-- Topbar: optional country filters -->
+<template id="exhibitors_topbar_country"
+    inherit_id="website_event_track_exhibitor.exhibitors_topbar"
+    name="Filter by Country"
+    active="True"
+    customize_show="True">
+    <xpath expr="//ul[hasclass('o_wesponsor_topbar_filters')]" position="inside">
+        <li class="nav-item dropdown mr-2 my-1">
+            <a href="#" role="button" class="btn dropdown-toggle" data-toggle="dropdown">
+                <i class="fa fa-folder-open"/>
+                By Country
+            </a>
+            <div class="dropdown-menu">
+                <a t-att-href="'/event/%s/exhibitors?%s' % (slug(event), keep_query('*', countries=''))"
+                    t-attf-class="dropdown-item d-flex align-items-center justify-content-between #{'active' if not search_countries else ''}">
+                    All Countries
+                </a>
+                <t t-foreach="sponsor_countries" t-as="sponsor_country">
+                    <a t-att-href="'/event/%s/exhibitors?%s' % (
+                            slug(event),
+                            keep_query('*', countries=str((search_countries - sponsor_country).ids if sponsor_country in search_countries else (sponsor_country | search_countries).ids))
+                        )"
+                        t-attf-class="dropdown-item d-flex align-items-center justify-content-between #{'active' if sponsor_country in search_countries else ''}">
+                        <t t-esc="sponsor_country.name"/>
+                    </a>
+                </t>
+            </div>
+        </li>
+    </xpath>
+</template>
+
+<!-- Topbar: optional sponsorship filters -->
+<template id="exhibitors_topbar_sponsorship"
+    inherit_id="website_event_track_exhibitor.exhibitors_topbar"
+    name="Filter by Sponsorship"
+    active="True"
+    customize_show="True">
+    <xpath expr="//ul[hasclass('o_wesponsor_topbar_filters')]" position="inside">
+        <li class="nav-item dropdown mr-2 my-1">
+            <a href="#" role="button" class="btn dropdown-toggle" data-toggle="dropdown">
+                <i class="fa fa-folder-open"/>
+                By Sponsorship
+            </a>
+            <div class="dropdown-menu">
+                <a t-att-href="'/event/%s/exhibitors?%s' % (slug(event), keep_query('*', sponsorships=''))"
+                    t-attf-class="dropdown-item d-flex align-items-center justify-content-between #{'active' if not search_sponsorships else ''}">
+                    All Countries
+                </a>
+                <t t-foreach="sponsor_types" t-as="sponsor_type">
+                    <a t-att-href="'/event/%s/exhibitors?%s' % (
+                            slug(event),
+                            keep_query('*', sponsorships=str((search_sponsorships - sponsor_type).ids if sponsor_type in search_sponsorships else (sponsor_type | search_sponsorships).ids))
+                        )"
+                        t-attf-class="dropdown-item d-flex align-items-center justify-content-between #{'active' if sponsor_type in search_sponsorships else ''}">
+                        <t t-esc="sponsor_type.name"/>
+                    </a>
+                </t>
+            </div>
+        </li>
+    </xpath>
+</template>
+
+<!-- ============================================================ -->
+<!-- CONTENT: MAIN TEMPLATES -->
+<!-- ============================================================ -->
+
+<!-- Exhibitors Main Display -->
+<template id="exhibitors_main" name="Exhibitors: Main Display">
+    <!-- No exhibitors -->
+    <t t-if="not sponsor_categories">
+        <div class="col-12">
+            <div class="h2 mb-3">No exhibitor found.</div>
+            <div t-if="search_key" class="alert alert-info text-center">
+                <p class="m-0">We did not find any exhibitor matching your <strong t-esc="search_key"/> search.</p>
+            </div>
+            <div t-else="" class="alert alert-info text-center" groups="event.group_event_manager">
+                <p class="m-0">Add some exhibitors to get started !</p>
+            </div>
+        </div>
+    </t>
+    <!-- Cards -->
+    <div class="col-12" t-call="website_event_track_exhibitor.exhibitors_display_cards"/>
+</template>
+
+<!-- Exhibitors: Cards-based display -->
+<template id="exhibitors_display_cards" name="Exhibitors Cards">
+    <div t-foreach="sponsor_categories" t-as="sponsor_category" class="row mb-3">
+        <div class="col-12">
+            <h5 class="m-0" t-esc="sponsor_category['sponsorship'].name"/>
+            <hr class="mt-2 pb-1 mb-1"/>
+        </div>
+        <div t-foreach="sponsor_category['sponsors']" t-as="sponsor" class="col-md-6 col-lg-3 mb-4">
+            <t t-call="website_event_track_exhibitor.exhibitor_card"/>
+        </div>
+    </div>
+</template>
+
+<!-- ============================================================ -->
+<!-- TOOL TEMPLATES -->
+<!-- ============================================================ -->
+
+<template id="exhibitor_card" name="Exhibitor Card">
+    <article t-att-class="'h-100 card border-0 shadow-sm o_wesponsor_card %s' % ('o_wesponsor_card_unpublished' if not sponsor.is_published else '')"
+        itemscope="itemscope" itemtype="http://schema.org/Event">
+        <div class="h-100 row no-gutters">
+            <t t-set="sponsor_image_url" t-value="sponsor.website_image_url"/>
+            <header t-att-class="'overflow-hidden col-12 rounded-top position-static %s' % ('bg-secondary' if not sponsor_image_url else 'bg-light')">
+
+                <small t-if="not sponsor.is_published" class="o_wesponsor_card_header_badge bg-danger">
+                    <i class="fa fa-ban mr-2"/>Unpublished
+                </small>
+
+                <div t-att-data-sponsor-url="sponsor.website_url" class="o_wesponsor_js_connect"
+                     t-attf-data-register-url="/event/#{slug(event)}/register?from_sponsor_id=#{sponsor.id}"
+                     t-att-data-is-participating="event.is_participating"
+                     t-att-data-sponsor-id="sponsor.id"
+                     t-att-data-event-is-ongoing="sponsor.event_id.is_ongoing"
+                     t-att-data-sponsor-is-ongoing="sponsor.is_in_opening_hours"
+                     t-att-data-user-event-manager="user_event_manager">
+                    <div t-if="sponsor_image_url" class="card-img-top position-static o_wesponsor_bg_image"
+                        t-attf-style="padding-top: 50%; background-image: url(#{sponsor_image_url});">
+                        <div class="o_wesponsor_connect_button">
+                            <a href="#" class="btn btn-primary h3">Connect</a>
+                        </div>
+                        <img class="position-absolute mr-2 mt-2"
+                            style="right: 0; top: 0; max-height: 20px;"
+                            t-if="sponsor.partner_id.country_id"
+                            t-att-src="website.image_url(sponsor.partner_id.country_id, 'image')"
+                            t-att-alt="sponsor.partner_id.country_id.name"/>
+                    </div>
+                    <div t-else="" class="o_wesponsor_gradient card-img-top position-relative"
+                        style="padding-top: 50%">
+                        <div class="o_wesponsor_connect_button">
+                            <a href="#" class="btn btn-primary h3">Connect</a>
+                        </div>
+                    </div>
+                </div>
+            </header>
+            <div class="col-12">
+                <main class="card-body h-100">
+                    <!-- Title -->
+                    <h5 class="card-title mt-0 mb-0 text-truncate d-flex align-items-top">
+                        <span t-field="sponsor.name" itemprop="name"/>
+                        <span t-if="sponsor.is_in_opening_hours and sponsor.chat_room_id"
+                            class="ml-auto badge badge-danger">Live
+                        </span>
+                    </h5>
+                    <!-- Catchy sentence -->
+                    <span class="text-muted" t-esc="sponsor.subtitle"/>
+                </main>
+            </div>
+        </div>
+    </article>
+</template>
+
+<!-- Searched terms -->
+<template id="exhibitors_search" name="Exhibitors: search terms">
+    <div class="d-flex align-items-center mb-3">
+        <t t-foreach="search_countries" t-as="country">
+            <span class="align-items-baseline border d-inline-flex pl-2 mt-3 rounded ml16 mb-2 bg-white">
+                <i class="fa fa-tag mr-2 text-muted"/>
+                <t t-esc="country.display_name"/>
+                <a t-att-href="'/event/%s/exhibitors?%s' % (
+                    slug(event),
+                    keep_query('*', countries=str((search_countries - country).ids)))"
+                    class="btn border-0 py-1">&#215;</a>
+            </span>
+        </t>
+        <t t-foreach="search_sponsorships" t-as="sponsorship">
+            <span class="align-items-baseline border d-inline-flex pl-2 mt-3 rounded ml16 mb-2 bg-white">
+                <i class="fa fa-tag mr-2 text-muted"/>
+                <t t-esc="sponsorship.display_name"/>
+                <a t-att-href="'/event/%s/exhibitors?%s' % (
+                    slug(event),
+                    keep_query('*', sponsorships=str((search_sponsorships - sponsorship).ids)))"
+                    class="btn border-0 py-1">&#215;</a>
+            </span>
+        </t>
+    </div>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_exhibitor/views/event_exhibitor_templates_page.xml b/addons/website_event_track_exhibitor/views/event_exhibitor_templates_page.xml
new file mode 100644
index 00000000000..81745db9186
--- /dev/null
+++ b/addons/website_event_track_exhibitor/views/event_exhibitor_templates_page.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_exhibitor_main" name="Event Exhibitor">
+    <t t-set="no_header" t-value="option_widescreen"/>
+    <t t-set="no_footer" t-value="option_widescreen"/>
+    <t t-call="website_event.layout">
+        <div class="o_wevent_online o_wevent_online_bg o_wesponsor_index">
+            <!-- Options -->
+            <t t-set="option_widescreen" t-value="option_widescreen or False"/>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wesponsor_index_1" class="oe_structure"/>
+            <!-- Content -->
+            <div t-att-class="'o_wevent_online_page_container %s' % ('container pb-3' if not option_widescreen else 'pb-3')">
+                <div class="row mb-5 mx-0">
+                    <t t-call="website_event_track_exhibitor.exhibitor_aside"/>
+                    <t t-call="website_event_track_exhibitor.exhibitor_main"/>
+                </div>
+            </div>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wesponsor_index_2" class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+<!-- ============================================================ -->
+<!-- CONTENT: MAIN TEMPLATES -->
+<!-- ============================================================ -->
+
+<template id="exhibitor_main" name="Exhibitor: Main Content">
+    <div t-att-class="'col-12 o_wevent_online_page_main o_wesponsor_exhibitor_main bg-white p-0 %s' % ('col-md-9 col-lg-10' if option_widescreen else 'col-md-8 col-lg-9')">
+        <!-- EVENT NOT STARTED ALERTS -->
+        <div t-if="not sponsor.event_id.is_ongoing" class="alert alert-warning rounded-0 text-center" role="alert">
+            Event <span t-esc="sponsor.event_id.name" class="font-weight-bold"/>
+            <span t-if="sponsor.event_id.start_today">
+                starts in
+                <span t-esc="sponsor.event_id.start_remaining"
+                    t-options="{'widget': 'duration', 'digital': True, 'unit': 'minute', 'round': 'minute'}"/>.
+            </span>
+            <span class="my-0" t-else="">
+                starts at
+                <span t-field="sponsor.event_id.with_context(tz=sponsor.event_id.date_tz).date_begin"
+                    t-options="{'format': 'medium'}"/> (<t t-esc="sponsor.event_id.date_tz"/>).
+            </span>
+            <br/>
+            <span>Join us there to meet <b t-esc="sponsor.partner_name"/> !</span>
+        </div>
+        <!-- SPONSOR JITSI + CLOSED/FULL ALERTS -->
+        <div t-if="sponsor.event_id.is_ongoing and sponsor.chat_room_id" class="d-flex flex-column">
+            <t t-if="not sponsor.is_in_opening_hours">
+                <div class="col-12 alert alert-warning rounded-0 text-center" role="alert">
+                    <span>Oops! This room is currently closed</span><br />
+                    Come back between
+                    <strong>
+                        <t t-esc="sponsor.hour_from" t-options="{'widget': 'float_time'}"/>
+                        -
+                        <t t-esc="sponsor.hour_to" t-options="{'widget': 'float_time'}"/>
+                    </strong> (<span t-esc="sponsor.event_date_tz"/>)
+                    to meet them !
+                </div>
+            </t>
+            <t t-elif="sponsor.room_is_full">
+                <div class="col-12 alert alert-warning rounded-0 text-center" role="alert">
+                    <span>Oops! This room is full</span><br />Come back later to have a chat with us!
+                </div>
+            </t>
+            <t t-else="">
+                <div id="o_wsponsor_jitsi_iframe"/>
+                <div class="d-flex flex-row-reverse">
+                    <t t-call="website_jitsi.chat_room_join_button">
+                        <t t-set="_classes" t-value="'d-none'"/>
+                        <t t-set="room_name" t-value="sponsor.room_name"/>
+                        <t t-set="chat_room_id" t-value="sponsor.chat_room_id.id"/>
+                        <t t-set="auto_open" t-value="1"/>
+                        <t t-set="attach_to" t-value="'#o_wsponsor_jitsi_iframe'"/>
+                        <t t-set="check_full" t-value="option_can_edit"/>
+                    </t>
+                </div>
+            </t>
+        </div>
+        <!-- SPONSOR DESCRIPTION -->
+        <span class="h5 d-inline-block mx-3 mt-3 mb-0">About <t t-esc="sponsor.name"/></span>
+        <hr class="mt-2 mb-0"/>
+        <div class="ml-3">
+            <div class="float-left pt-3">
+                <span t-if="sponsor.image_512" t-field="sponsor.image_512" class="o_wevent_online_page_avatar"
+                    t-options="{'widget': 'image', 'class': 'rounded-circle', 'max-width': '96'}"/>
+                <span t-elif="sponsor.partner_id.image_512" t-field="sponsor.partner_id.image_512" class="o_wevent_online_page_avatar"
+                    t-options="{'widget': 'image', 'class': 'rounded-circle', 'max-width': '96'}"/>
+            </div>
+            <div class="px-3 pt-3 d-flex flex-row justify-content-between position-relative">
+                <div class="d-flex flex-column">
+                    <div class="d-flex align-items-center">
+                        <span t-field="sponsor.name" class="h4 mb-0"/>
+                        <div t-if="sponsor.sponsor_type_id.display_ribbon_style and sponsor.sponsor_type_id.display_ribbon_style != 'no_ribbon'" class="ribbon-wrapper">
+                            <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>
+                        </div>
+                    </div>
+                    <span t-field="sponsor.subtitle" class="text-muted mb-3"/>
+                    <div t-if="sponsor.url" class="d-flex text-break align-items-baseline">
+                        <i class="fa fa-home mr-2"/><a t-att-href="sponsor.url"><span t-field="sponsor.url"/></a>
+                    </div>
+                    <div t-elif="sponsor.partner_id.website" class="d-flex text-break align-items-baseline">
+                        <i class="fa fa-home mr-2"/><a t-att-href="sponsor.partner_id.website"><span t-field="sponsor.partner_id.website"/></a>
+                    </div>
+                    <div t-if="sponsor.email" class="d-flex text-break align-items-baseline">
+                        <i class="fa fa-envelope mr-2"/><a t-att-mailto="sponsor.email"><span t-field="sponsor.email"/></a>
+                    </div>
+                    <div t-if="sponsor.phone" class="d-flex text-break align-items-baseline">
+                        <i class="fa fa-phone mr-2"/><span t-field="sponsor.phone"/>
+                    </div>
+                </div>
+                <a t-if="sponsor.partner_id.country_id"
+                    t-att-href="'/event/%s/exhibitors?countries=%s' % (slug(sponsor.event_id), [sponsor.partner_id.country_id.id])"
+                    t-attf-class="text-right d-none d-md-block #{'mr-5' if sponsor.sponsor_type_id.display_ribbon_style and sponsor.sponsor_type_id.display_ribbon_style != 'no_ribbon' else ''}">
+                    <img class="img"
+                        style="max-height: 36px;"
+                        t-att-src="website.image_url(sponsor.partner_id.country_id, 'image')"
+                        t-att-alt="sponsor.partner_id.country_id.name"/>
+                </a>
+            </div>
+        </div>
+        <div t-field="sponsor.website_description" class="my-2 mx-3 oe_no_empty"/>
+    </div>
+</template>
+
+<!-- ============================================================ -->
+<!-- ASIDE: CONTROL PANEL -->
+<!-- ============================================================ -->
+
+<template id="exhibitor_aside" name="Exhibitor: Aside">
+    <div t-att-class="'col-12 pl-0 pr-0 pr-md-3 o_wevent_online_page_aside o_wesponsor_exhibitor_aside %s' % ('col-md-3 col-lg-2' if option_widescreen else 'col-md-4 col-lg-3')">
+        <div class="bg-white o_wevent_online_page_aside_content">
+            <div class="d-flex align-items-center justify-content-between mx-2">
+                <span class="h5 mb-0 pt-0 pt-md-3 pb-0 pb-md-2">Other exhibitors</span>
+                <a href="#collapse_exhibitor_aside" data-toggle="collapse"
+                   class="d-lg-none p-2 text-decoration-none o_wevent_online_page_aside_collapse collapsed">
+                    <i class="fa fa-chevron-down d-lg-none"/>
+                </a>
+            </div>
+            <ul id="collapse_exhibitor_aside" class="list-unstyled collapse d-lg-block mb-0">
+                <li t-foreach="sponsors_other" t-as="sponsor_other">
+                    <a class="d-flex w-100 h-100 px-2 pt-2 pb-1 text-decoration-none"
+                        t-att-href="sponsor_other.website_url">
+                        <img t-if="sponsor_other.partner_id.country_id"
+                            class="mr-2 o_wesponsor_aside_logo"
+                            t-att-src="website.image_url(sponsor_other.partner_id.country_id, 'image')"
+                            t-att-alt="sponsor_other.partner_id.country_id.name"/>
+                        <div class="flex-grow-1 overflow-auto">
+                            <span class="d-flex align-items-baseline o_wesponsor_sponsor_name">
+                                <span class="d-inline-block text-truncate" t-esc="sponsor_other.name"/>
+                                <span class="badge badge-light ml-auto" t-esc="sponsor_other.sponsor_type_id.name"/>
+                            </span>
+                            <small class="text-muted" t-esc="sponsor_other.subtitle"/>
+                        </div>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</template>
+
+<!-- ============================================================ -->
+<!-- MISC / MENUS -->
+<!-- ============================================================ -->
+
+<!-- User Navbar - Edit Options -->
+<template id="event_sponsor_edit_options" inherit_id="website.user_navbar" name="Edit Event Sponsor Options">
+    <xpath expr="//li[@id='edit-page-menu']" position="after">
+        <t t-if="main_object._name == 'event.sponsor'"
+            t-set="action" t-value="'website_event_track_exhibitor.event_sponsor_action'"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_exhibitor/views/event_sponsor_views.xml b/addons/website_event_track_exhibitor/views/event_sponsor_views.xml
new file mode 100644
index 00000000000..4228c23527d
--- /dev/null
+++ b/addons/website_event_track_exhibitor/views/event_sponsor_views.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="event_sponsor_view_search" model="ir.ui.view">
+        <field name="name">event.sponsor.view.search.inherit.exhibitor</field>
+        <field name="model">event.sponsor</field>
+        <field name="inherit_id" ref="website_event_track_online.event_sponsor_view_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='archived']" position="after">
+                <separator/>
+                <filter string="Exhibitor" name="filter_is_exhibitor" domain="[('is_exhibitor', '=', True)]"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_sponsor_view_tree" model="ir.ui.view">
+        <field name="name">event.sponsor.view.tree.inherit.exhibitor</field>
+        <field name="model">event.sponsor</field>
+        <field name="inherit_id" ref="website_event_track_online.event_sponsor_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='sponsor_type_id']" position="after">
+                <field name="is_exhibitor"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_sponsor_view_kanban" model="ir.ui.view">
+        <field name="name">event.sponsor.view.kanban.inherit.kanban</field>
+        <field name="model">event.sponsor</field>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_view_kanban"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="replace">
+                <field name="name"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_sponsor_view_form" model="ir.ui.view">
+        <field name="name">event.sponsor.view.form.inherit.exhibitor</field>
+        <field name="model">event.sponsor</field>
+        <field name="inherit_id" ref="website_event_track_online.event_sponsor_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//widget[@name='web_ribbon']" position="before">
+                <div class="oe_button_box" name="button_box">
+                    <field name="website_url" invisible="1"/>
+                    <field name="is_published" widget="website_redirect_button"/>
+                </div>
+            </xpath>
+            <xpath expr="//h1" position="after">
+                <div class="oe_title">
+                    <label for="subtitle" class="oe_edit_only"/>
+                    <field name="subtitle" placeholder="e.g. : Your best choice for your home"/>
+                </div>
+            </xpath>
+            <xpath expr="//field[@name='sponsor_type_id']" position="after">
+                <field name="is_exhibitor"/>
+            </xpath>
+            <xpath expr="//field[@name='mobile']" position="after">
+                <label for="hour_from" string="Opening Hours"/>
+                <div class="o_row">
+                    <field name="hour_from" widget="float_time" nolabel="1" class="oe_inline"/>
+                    <i class="fa fa-long-arrow-right mx-2" aria-label="Arrow icon" title="Arrow"/>
+                    <field name="hour_to" widget="float_time" nolabel="1" class="oe_inline"/>
+                    <field name="event_date_tz" nolabel="1" class="oe_inline"/>
+                </div>
+            </xpath>
+            <xpath expr="//sheet/group" position="after">
+                <notebook>
+                    <page string="Description">
+                        <group>
+                            <field name="website_description" nolabel="1"/>
+                        </group>
+                    </page>
+                    <page string="Exhibitor" attrs="{'invisible': [('is_exhibitor', '=', False)]}">
+                        <group>
+                            <group>
+                                <field name="room_name" attrs="{'required': [('is_exhibitor', '=', True)]}" string="Jitsi Name"/>
+                                <field name="room_lang_id"/>
+                                <field name="room_max_capacity" attrs="{'required': [('is_exhibitor', '=', True)]}"/>
+                                <field name="chat_room_id" groups="base.group_no_one"/>
+                            </group>
+                        </group>
+                    </page>
+                </notebook>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_sponsor_action" model="ir.actions.act_window">
+        <field name="name">Event Sponsors</field>
+        <field name="res_model">event.sponsor</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="help" type="html">
+<p class="o_view_nocontent_smiling_face">
+    Create a Sponsor / Exhibitor
+</p><p>
+    Sponsors might be advertised on you event pages footer.<br />
+    Exhibitors might have a dedicated page with chat room for people to connect with them.
+</p>
+        </field>
+    </record>
+
+    <record id="website_event_track.event_sponsor_action_from_event" model="ir.actions.act_window">
+        <field name="help" type="html">
+<p class="o_view_nocontent_smiling_face">
+    Create a Sponsor / Exhibitor
+</p><p>
+    Sponsors might be advertised on you event pages footer.<br />
+    Exhibitors might have a dedicated page with chat room for people to connect with them.
+</p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_exhibitor/views/event_type_views.xml b/addons/website_event_track_exhibitor/views/event_type_views.xml
new file mode 100644
index 00000000000..ab2ffe85c81
--- /dev/null
+++ b/addons/website_event_track_exhibitor/views/event_type_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="event_type_view_form" model="ir.ui.view">
+        <field name="name">event.type.view.form.inherit.exhibitor</field>
+        <field name="model">event.type</field>
+        <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='website_menu']" position='after'>
+                <div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
+                    <label class="col-lg-4" for="exhibitor_menu"/> <field name="exhibitor_menu"/>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_event_track_live/__init__.py b/addons/website_event_track_live/__init__.py
new file mode 100644
index 00000000000..7d34c7c054a
--- /dev/null
+++ b/addons/website_event_track_live/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
+from . import models
diff --git a/addons/website_event_track_live/__manifest__.py b/addons/website_event_track_live/__manifest__.py
new file mode 100644
index 00000000000..8f137e270e2
--- /dev/null
+++ b/addons/website_event_track_live/__manifest__.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Live Event Tracks',
+    'category': 'Marketing/Events',
+    'sequence': 1006,
+    'version': '1.0',
+    'summary': 'Support live tracks: streaming, participation, youtube',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        'website_event_track_online',
+        'website_event_track_session',
+    ],
+    'data': [
+        'views/assets.xml',
+        'views/event_track_templates_list.xml',
+        'views/event_track_templates_page.xml',
+        'views/event_track_views.xml',
+    ],
+    'demo': [
+        'data/event_track_demo.xml'
+    ],
+    'qweb': [
+        'static/src/xml/website_event_track_live_templates.xml'
+    ],
+    'application': False,
+    'installable': True,
+}
diff --git a/addons/website_event_track_live/controllers/__init__.py b/addons/website_event_track_live/controllers/__init__.py
new file mode 100644
index 00000000000..df58fe9572a
--- /dev/null
+++ b/addons/website_event_track_live/controllers/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import track_live
+from . import session
diff --git a/addons/website_event_track_live/controllers/session.py b/addons/website_event_track_live/controllers/session.py
new file mode 100644
index 00000000000..9d6381e6300
--- /dev/null
+++ b/addons/website_event_track_live/controllers/session.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import re
+
+from odoo.addons.website_event_track_session.controllers.session import WebsiteEventSessionController
+from odoo.http import request
+
+
+class WebsiteEventSessionLiveController(WebsiteEventSessionController):
+
+    def _event_track_page_get_values(self, event, track, **options):
+        if 'widescreen' not in options:
+            options['widescreen'] = bool(track.youtube_video_url)
+        values = super(WebsiteEventSessionLiveController, self)._event_track_page_get_values(event, track, **options)
+        # Youtube disables the chat embed on all mobile devices
+        # This regex is a naive attempt at matching their behavior (should work for most cases)
+        values['is_mobile_chat_disabled'] = bool(re.match(
+            r'^.*(Android|iPad|iPhone).*',
+            request.httprequest.headers.get('User-Agent', request.httprequest.headers.get('user-agent', ''))))
+        return values
diff --git a/addons/website_event_track_live/controllers/track_live.py b/addons/website_event_track_live/controllers/track_live.py
new file mode 100644
index 00000000000..d85d3d13c79
--- /dev/null
+++ b/addons/website_event_track_live/controllers/track_live.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import http
+
+from odoo.addons.website_event_track_online.controllers.event_track import EventTrackOnlineController
+
+
+class EventTrackLiveController(EventTrackOnlineController):
+
+    @http.route('/event_track/get_track_suggestion', type='json', auth='public', website=True)
+    def get_next_track_suggestion(self, track_id):
+        track = self._fetch_track(track_id)
+        track_suggestion = track._get_track_suggestions(
+            restrict_domain=[('youtube_video_url', '!=', False), ('is_published', '=', True)],
+            limit=1)
+        if not track_suggestion:
+            return False
+        track_suggestion_sudo = track_suggestion.sudo()
+        track_sudo = track.sudo()
+        return self._prepare_track_suggestion_values(track_sudo, track_suggestion_sudo)
+
+    def _prepare_track_suggestion_values(self, track, track_suggestion):
+        return {
+            'current_track': {
+                'name': track.name,
+                'website_image_url': track.website_image_url,
+            },
+            'suggestion': {
+                'id': track_suggestion.id,
+                'name': track_suggestion.name,
+                'speaker_name': track_suggestion.partner_name,
+                'website_url': track_suggestion.website_url
+            }
+        }
diff --git a/addons/website_event_track_live/data/event_track_demo.xml b/addons/website_event_track_live/data/event_track_demo.xml
new file mode 100644
index 00000000000..79e01e8c5f0
--- /dev/null
+++ b/addons/website_event_track_live/data/event_track_demo.xml
@@ -0,0 +1,46 @@
+<?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">
+        <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" />
+    </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" />
+    </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" />
+    </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>
+    <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" />
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_live/models/__init__.py b/addons/website_event_track_live/models/__init__.py
new file mode 100644
index 00000000000..e3798014924
--- /dev/null
+++ b/addons/website_event_track_live/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_track
diff --git a/addons/website_event_track_live/models/event_track.py b/addons/website_event_track_live/models/event_track.py
new file mode 100644
index 00000000000..7765bfa455b
--- /dev/null
+++ b/addons/website_event_track_live/models/event_track.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import re
+
+from odoo import api, fields, models
+
+
+class Track(models.Model):
+    _inherit = 'event.track'
+
+    youtube_video_url = fields.Char('Youtube Video URL',
+        help="Configure this URL so that event attendees can see your Track in video!")
+    youtube_video_id = fields.Char('Youtube video ID', compute='_compute_youtube_video_id',
+        help="Extracted from the video URL and used to infer various links (embed/thumbnail/...)")
+    is_youtube_replay = fields.Boolean('Is Youtube Replay',
+        help="Check this option if the video is already available on Youtube to avoid showing 'Direct' options (Chat, ...)")
+    is_youtube_chat_available = fields.Boolean('Is Chat Available', compute='_compute_is_youtube_chat_available')
+
+    @api.depends('youtube_video_url')
+    def _compute_youtube_video_id(self):
+        for track in self:
+            if track.youtube_video_url:
+                regex = r'^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|&v=)([^#&?]*).*'
+                match = re.match(regex, track.youtube_video_url)
+                if match and len(match.groups()) == 2 and len(match.group(2)) == 11:
+                    track.youtube_video_id = match.group(2)
+
+            if not track.youtube_video_id:
+                track.youtube_video_id = False
+
+    @api.depends('youtube_video_id', 'is_youtube_replay', 'date_end', 'is_track_done')
+    def _compute_website_image_url(self):
+        youtube_thumbnail_tracks = self.filtered(lambda track: not track.website_image and track.youtube_video_id)
+        super(Track, self - youtube_thumbnail_tracks)._compute_website_image_url()
+        for track in youtube_thumbnail_tracks:
+            track.website_image_url = f'https://img.youtube.com/vi/{track.youtube_video_id}/maxresdefault.jpg'
+
+    @api.depends('youtube_video_url', 'is_youtube_replay', 'date', 'date_end', 'is_track_upcoming', 'is_track_live')
+    def _compute_is_youtube_chat_available(self):
+        for track in self:
+            track.is_youtube_chat_available = track.youtube_video_url and not track.is_youtube_replay and (track.is_track_soon or track.is_track_live)
diff --git a/addons/website_event_track_live/static/src/js/website_event_track_live.js b/addons/website_event_track_live/static/src/js/website_event_track_live.js
new file mode 100644
index 00000000000..a330308de63
--- /dev/null
+++ b/addons/website_event_track_live/static/src/js/website_event_track_live.js
@@ -0,0 +1,121 @@
+var onYouTubeIframeAPIReady;
+
+odoo.define('website_event_track_live.website_event_youtube_embed', function (require) {
+'use strict';
+
+var publicWidget = require('web.public.widget');
+var TrackSuggestionWidget = require('website_event_track_live.website_event_track_suggestion');
+
+var YOUTUBE_VIDEO_ENDED = 0;
+var YOUTUBE_VIDEO_PLAYING = 1;
+var YOUTUBE_VIDEO_PAUSED = 2;
+
+publicWidget.registry.websiteEventTrackLive = publicWidget.Widget.extend({
+    selector: '.o_wevent_event_track_live',
+    custom_events: _.extend({}, publicWidget.Widget.prototype.custom_events, {
+        'video-ended': '_onVideoEnded'
+    }),
+
+    start: function () {
+        var self = this;
+        return this._super(...arguments).then(function () {
+            self._setupYoutubePlayer();
+            self.isFullScreen = !!document.fullscreenElement;
+        });
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    _onPlayerReady: function () {
+        $(window).on('resize', this._onResize.bind(this));
+        this.$('.o_wevent_event_track_live_loading').remove();
+    },
+
+    _onPlayerStateChange: function (event) {
+        if (event.data === YOUTUBE_VIDEO_ENDED) {
+            this.trigger('video-ended');
+        } else if (event.data === YOUTUBE_VIDEO_PLAYING) {
+            this.trigger('video-playing');
+        } else if (event.data === YOUTUBE_VIDEO_PAUSED) {
+            this.trigger('video-paused');
+        }
+    },
+
+    _onVideoEnded: function () {
+        var self = this;
+        this._rpc({
+            route: '/event_track/get_track_suggestion',
+            params: {
+                track_id: this.$el.data('trackId'),
+            }
+        }).then(function (suggestion) {
+            self.nextSuggestion = suggestion;
+            self._showSuggestion();
+        });
+    },
+
+    _onReplay: function () {
+        this.youtubePlayer.seekTo(0);
+        this.youtubePlayer.playVideo();
+        if (this.trackSuggestion) {
+            delete this.trackSuggestion;
+        }
+    },
+
+    /**
+     * The 'fullscreenchange' event is probably a better fit but it is unfortunately
+     * not triggered when Youtube enters fullscreen mode.
+     * However, the global window 'resize' is.
+     */
+    _onResize: function () {
+        this.isFullScreen = !!document.fullscreenElement;
+        this._showSuggestion();
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _setupYoutubePlayer: function () {
+        var self = this;
+
+        var youtubeId = self.$el.data('youtubeVideoId');
+        var $youtubeElement = $('<script/>', {src: 'https://www.youtube.com/iframe_api'});
+        $(document.head).append($youtubeElement);
+
+        onYouTubeIframeAPIReady = function () {
+            self.youtubePlayer = new YT.Player('o_wevent_youtube_iframe_container', {
+                height: '100%',
+                width: '100%',
+                videoId: youtubeId,
+                playerVars: {
+                    autoplay: 1,
+                    enablejsapi: 1,
+                    rel: 0,
+                    origin: window.location.origin,
+                    widget_referrer: window.location.origin,
+                },
+                events: {
+                    'onReady': self._onPlayerReady.bind(self),
+                    'onStateChange': self._onPlayerStateChange.bind(self)
+                }
+            });
+        };
+    },
+
+    /**
+     * Automatically launches the next suggested track when this one ends
+     * and the user is not in fullscreen mode.
+     */
+    _showSuggestion: function () {
+        if (this.nextSuggestion && !this.isFullScreen && !this.trackSuggestion) {
+            this.trackSuggestion = new TrackSuggestionWidget(this, this.nextSuggestion);
+            this.trackSuggestion.appendTo(this.$el);
+            this.trackSuggestion.on('replay', null, this._onReplay.bind(this));
+        }
+    }
+});
+
+});
diff --git a/addons/website_event_track_live/static/src/js/website_event_track_suggestion.js b/addons/website_event_track_live/static/src/js/website_event_track_suggestion.js
new file mode 100644
index 00000000000..e6583c22509
--- /dev/null
+++ b/addons/website_event_track_live/static/src/js/website_event_track_suggestion.js
@@ -0,0 +1,81 @@
+odoo.define('website_event_track_live.website_event_track_suggestion', function (require) {
+'use strict';
+
+var Widget = require('web.Widget');
+
+var WebsiteEventTrackSuggestion = Widget.extend({
+    template: 'website_event_track_live.website_event_track_suggestion',
+    xmlDependencies: ['/website_event_track_live/static/src/xml/website_event_track_live_templates.xml'],
+    events: {
+        'click .owevent_track_suggestion_next': '_onNextTrackClick',
+        'click .owevent_track_suggestion_close': '_onCloseClick',
+        'click .owevent_track_suggestion_replay': '_onReplayClick'
+    },
+
+    init: function (parent, options) {
+        this._super(...arguments);
+
+        this.currentTrack = {
+            'name': options.current_track.name,
+            'imageSrc': options.current_track.website_image_url,
+        };
+        this.suggestion = {
+            'name': options.suggestion.name,
+            'speakerName': options.suggestion.speaker_name,
+            'trackUrl': options.suggestion.website_url,
+        };
+    },
+
+    start: function () {
+        var self = this;
+        this._super(...arguments).then(function () {
+            self.timerInterval = setInterval(self._updateTimer.bind(self), 1000);
+        });
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * If the user clicks on replay, remove this suggestion window and send an
+     * event to the parent so that it can rewind the video to the beginning.
+     */
+    _onReplayClick: function () {
+        this.trigger_up('replay');
+        clearInterval(this.timerInterval);
+        this.destroy();
+    },
+
+    _onCloseClick: function () {
+        clearInterval(this.timerInterval);
+        this.$('.owevent_track_suggestion_next').addClass('invisible');
+    },
+
+    _onNextTrackClick: function (ev) {
+        if ($(ev.target).hasClass('owevent_track_suggestion_close')) {
+            return;
+        }
+
+        window.location = this.suggestion.trackUrl;
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _updateTimer: function () {
+        var secondsLeft = parseInt(this.$('.owevent_track_suggestion_timer_text').text());
+
+        if (secondsLeft > 1) {
+            secondsLeft -= 1;
+            this.$('.owevent_track_suggestion_timer_text').text(secondsLeft);
+        } else {
+            window.location = this.suggestion.trackUrl;
+        }
+    }
+});
+
+return WebsiteEventTrackSuggestion;
+
+});
diff --git a/addons/website_event_track_live/static/src/scss/website_event_track_live.scss b/addons/website_event_track_live/static/src/scss/website_event_track_live.scss
new file mode 100644
index 00000000000..28571e01ffa
--- /dev/null
+++ b/addons/website_event_track_live/static/src/scss/website_event_track_live.scss
@@ -0,0 +1,42 @@
+.o_wesession_track_aside_tab_chat {
+    height: 70vh;
+}
+
+#o_wevent_youtube_iframe_container, .o_wevent_event_track_live_loading {
+    height: 85vh;
+}
+
+.o_wevent_event_track_live_loading {
+    background-color: #888888;
+
+    i {
+        bottom: 1px;
+    }
+}
+
+.owevent_track_suggestion {
+    background-color: #888888;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    height: 85vh;
+    top: 0px;
+    left: 0px;
+
+    .owevent_track_suggestion_content {
+        background-color: rgba(0,0,0,.5);
+
+        .owevent_track_suggestion_next {
+            background-color: rgba(0,0,0,.5);
+            transition: background-color .3s linear;
+            &:hover {
+                cursor: pointer;
+                background-color: rgba(0,0,0,.9);
+            }
+
+            .owevent_track_suggestion_close {
+                top: .5rem;
+                right: .5rem;
+            }
+        }
+    }
+}
diff --git a/addons/website_event_track_live/static/src/xml/website_event_track_live_templates.xml b/addons/website_event_track_live/static/src/xml/website_event_track_live_templates.xml
new file mode 100644
index 00000000000..1784afae39c
--- /dev/null
+++ b/addons/website_event_track_live/static/src/xml/website_event_track_live_templates.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+
+<div t-name="website_event_track_live.website_event_track_suggestion"
+    class="owevent_track_suggestion position-absolute w-100"
+    t-attf-style="background-image: url('#{widget.currentTrack.imageSrc}');">
+    <div class="h-100 w-100 p-4 d-flex flex-column align-items-center owevent_track_suggestion_content">
+        <div class="flex-grow-1 pt-5 d-flex flex-column align-items-center justify-content-center">
+            <div class="text-white">You just watched:</div>
+            <div class="h1 text-white" t-esc="widget.currentTrack.name"/>
+            <div>
+                <a href="#" class="owevent_track_suggestion_replay font-weight-bold">
+                    <span>Replay Video</span>
+                </a>
+            </div>
+        </div>
+        <div class="d-flex w-100 flex-column align-items-end">
+            <div class="p-2 rounded owevent_track_suggestion_next position-relative">
+                <div class="text-white text-right owevent_track_suggestion_close_wrapper">
+                    <i class="fa fa-remove owevent_track_suggestion_close position-absolute"/>
+                </div>
+                <span class="text-white">Up Next:</span>
+                <span class="text-primary font-weight-bold pr-4" t-esc="widget.suggestion.name"/>
+                <div class="text-white owevent_track_suggestion_timer_text_wrapper">
+                    <span>Starts in</span>
+                    <span class="owevent_track_suggestion_timer_text">30</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+</templates>
diff --git a/addons/website_event_track_live/views/assets.xml b/addons/website_event_track_live/views/assets.xml
new file mode 100644
index 00000000000..0e7e85ce5b7
--- /dev/null
+++ b/addons/website_event_track_live/views/assets.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<odoo>
+
+<template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Track Live Assets Frontend">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" href="/website_event_track_live/static/src/scss/website_event_track_live.scss"/>
+    </xpath>
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_event_track_live/static/src/js/website_event_track_suggestion.js"></script>
+        <script type="text/javascript" src="/website_event_track_live/static/src/js/website_event_track_live.js"></script>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_live/views/event_track_templates_list.xml b/addons/website_event_track_live/views/event_track_templates_list.xml
new file mode 100644
index 00000000000..b2fc5243af7
--- /dev/null
+++ b/addons/website_event_track_live/views/event_track_templates_list.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="tracks_display_list" inherit_id="website_event_track_session.tracks_display_list">
+    <!-- TRACK LIST: ADD REPLAY TAG FOR FINISHED TRACKS -->
+    <xpath expr="//div[@name='o_wesession_list_item_organization']//span[@t-elif='not track.is_track_done and not track.is_track_soon']" position="after">
+        <a t-elif="track.youtube_video_url"
+            t-att-href="track.website_url" class="badge badge-danger">Replay
+        </a>
+    </xpath>
+    <!-- ADD YOUTUBE ICON -->
+    <xpath expr="//span[@name='o_wesession_list_item_topic']/a/span[@t-field='track.name']" position="before">
+        <i t-if="track.youtube_video_url and (track.is_track_soon or track.is_track_live or track.is_youtube_replay)"
+            class="fa fa-youtube-play text-danger mr-1"/>
+    </xpath>
+    <xpath expr="//span[@name='o_wesession_list_item_topic']/t/span[@t-field='track.name']" position="before">
+        <i t-if="track.youtube_video_url and (track.is_track_soon or track.is_track_live or track.is_youtube_replay)"
+            class="fa fa-youtube-play text-danger mr-1"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_live/views/event_track_templates_page.xml b/addons/website_event_track_live/views/event_track_templates_page.xml
new file mode 100644
index 00000000000..f72152f6e71
--- /dev/null
+++ b/addons/website_event_track_live/views/event_track_templates_page.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- MAIN: REMOVE HEADER/FOOTER IF WIDESCREEN -->
+<template id="event_track_main" inherit_id="website_event_track_session.event_track_main">
+    <xpath expr="//t[@t-call='website_event.layout']" position="before">
+        <t t-set="no_header" t-value="option_widescreen"/>
+        <t t-set="no_footer" t-value="option_widescreen"/>
+    </xpath>
+</template>
+
+<!-- MAIN: ADD VIDEO -->
+<template id="event_track_content" inherit_id="website_event_track_session.event_track_content">
+    <!-- Do not display "starting in" in case of replay mode as video is already available -->
+    <xpath expr="//div[@t-elif='track.track_start_remaining']" position="attributes">
+        <attribute name="t-elif">track.track_start_remaining and not track.is_youtube_replay</attribute>
+    </xpath>
+    <!-- Add video -->
+    <xpath expr="//div[@name='o_wesession_track_main']//div" position="before">
+        <t t-set="show_youtube_frame" t-value="track.youtube_video_url and (track.is_youtube_replay or track.is_track_soon or track.is_track_live or track.is_track_done)" />
+        <div t-if="show_youtube_frame" class="flex-grow-1 o_wevent_event_track_live"
+            t-att-data-track-id="track.id"
+            t-att-data-youtube-video-id="track.youtube_video_id">
+            <div class="position-absolute o_wevent_event_track_live_loading w-100 d-flex align-items-center justify-content-center text-white h4">
+                <i class="fa fa-spin fa-spinner position-relative"/>
+                <span class="pl-2">Loading Video...</span>
+            </div>
+            <div id="o_wevent_youtube_iframe_container" class="w-100"/>
+        </div>
+    </xpath>
+</template>
+
+<!-- ASIDE: ADD CHAT TAB FOR VIDEOS -->
+<template id="event_track_aside" inherit_id="website_event_track_session.event_track_aside">
+    <xpath expr="//ul[hasclass('o_wesession_track_aside_nav')]" position="inside">
+        <li t-if="track.is_youtube_chat_available and not is_mobile_chat_disabled" class="nav-item flex-grow-1">
+            <a href="#track_chat" aria-controls="track_chat" class="nav-link" role="tab" data-toggle="tab">
+                Chat
+            </a>
+        </li>
+    </xpath>
+    <xpath expr="//div[hasclass('o_wesession_track_aside_tabs')]" position="inside">
+        <div t-if="track.is_youtube_chat_available and not is_mobile_chat_disabled" id="track_chat"
+            class="tab-pane fade o_wesession_track_aside_tab_chat" role="tabpanel">
+            <iframe t-attf-src="https://www.youtube.com/live_chat?v=#{track.youtube_video_id}&amp;embed_domain=#{hostname}"
+                height="100%"
+                width="100%"
+                frameborder="0" allowfullscreen="allowfullscreen"/>
+        </div>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_live/views/event_track_views.xml b/addons/website_event_track_live/views/event_track_views.xml
new file mode 100644
index 00000000000..9ac764c79f8
--- /dev/null
+++ b/addons/website_event_track_live/views/event_track_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record id="event_track_view_form" model="ir.ui.view">
+        <field name="name">event.track.view.form.inherit.live</field>
+        <field name="model">event.track</field>
+        <field name="inherit_id" ref="website_event_track.view_event_track_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='active']" position="after">
+                <field name="youtube_video_url" widget="url" />
+                <field name="is_youtube_replay" attrs="{'invisible': [('youtube_video_url', '=', '')]}" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_live_quiz/__init__.py b/addons/website_event_track_live_quiz/__init__.py
new file mode 100644
index 00000000000..dd15b5c32e5
--- /dev/null
+++ b/addons/website_event_track_live_quiz/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
diff --git a/addons/website_event_track_live_quiz/__manifest__.py b/addons/website_event_track_live_quiz/__manifest__.py
new file mode 100644
index 00000000000..b01c4da1cce
--- /dev/null
+++ b/addons/website_event_track_live_quiz/__manifest__.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Quiz on Live Event Tracks',
+    'category': 'Hidden',
+    'version': '1.0',
+    'summary': 'Bridge module to support quiz features during "live" tracks. ',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        'website_event_track_live',
+        'website_event_track_quiz',
+    ],
+    'data': [
+        'views/assets.xml',
+        'views/event_track_templates_page.xml',
+    ],
+    'demo': [
+    ],
+    'qweb': [
+        'static/src/xml/website_event_track_live_templates.xml',
+        'static/src/xml/website_event_track_quiz_templates.xml',
+    ],
+    'application': False,
+    'installable': True,
+    'auto_install': True,
+}
diff --git a/addons/website_event_track_live_quiz/controllers/__init__.py b/addons/website_event_track_live_quiz/controllers/__init__.py
new file mode 100644
index 00000000000..b4c6a301891
--- /dev/null
+++ b/addons/website_event_track_live_quiz/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import track_live_quiz
diff --git a/addons/website_event_track_live_quiz/controllers/track_live_quiz.py b/addons/website_event_track_live_quiz/controllers/track_live_quiz.py
new file mode 100644
index 00000000000..282798301fe
--- /dev/null
+++ b/addons/website_event_track_live_quiz/controllers/track_live_quiz.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.website_event_track_live.controllers.track_live import EventTrackLiveController
+
+
+class EventTrackLiveQuizController(EventTrackLiveController):
+
+    def _prepare_track_suggestion_values(self, track, track_suggestion):
+        res = super(EventTrackLiveQuizController, self)._prepare_track_suggestion_values(track, track_suggestion)
+        res['current_track']['show_quiz'] = bool(track.quiz_id) and not track.is_quiz_completed
+        return res
diff --git a/addons/website_event_track_live_quiz/static/src/js/event_quiz.js b/addons/website_event_track_live_quiz/static/src/js/event_quiz.js
new file mode 100644
index 00000000000..2fd34e66aa4
--- /dev/null
+++ b/addons/website_event_track_live_quiz/static/src/js/event_quiz.js
@@ -0,0 +1,58 @@
+odoo.define('website_event_track_live_quiz.event_quiz', function (require) {
+'use strict';
+
+var Quiz = require('website_event_track_quiz.event.quiz');
+
+var WebsiteEventTrackSuggestionQuiz = Quiz.include({
+    xmlDependencies: Quiz.prototype.xmlDependencies.concat([
+        '/website_event_track_live_quiz/static/src/xml/website_event_track_quiz_templates.xml',
+    ]),
+
+    /**
+     * @override
+     */
+    willStart: function () {
+        return Promise.all([
+            this._super(...arguments),
+            this._getTrackSuggestion()
+        ]);
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _submitQuiz: function () {
+        var self = this;
+        return this._super(...arguments).then(function (data) {
+            if (data.quiz_completed) {
+                self.$('.o_quiz_js_quiz_next_track')
+                    .removeClass('btn-light')
+                    .addClass('btn-secondary');
+            }
+
+            return Promise.resolve(data);
+        });
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    _getTrackSuggestion: function () {
+        var self = this;
+        return this._rpc({
+            route: '/event_track/get_track_suggestion',
+            params: {
+                track_id: this.track.id,
+            }
+        }).then(function (suggestion) {
+            self.nextSuggestion = suggestion;
+            return Promise.resolve();
+        });
+    }
+});
+
+return WebsiteEventTrackSuggestionQuiz;
+
+});
diff --git a/addons/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js b/addons/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js
new file mode 100644
index 00000000000..17f98f9b7fd
--- /dev/null
+++ b/addons/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js
@@ -0,0 +1,34 @@
+odoo.define('website_event_track_live_quiz.website_event_track_suggestion', function (require) {
+'use strict';
+
+var WebsiteEventTrackSuggestion = require('website_event_track_live.website_event_track_suggestion');
+
+var WebsiteEventTrackSuggestionLiveQuiz = WebsiteEventTrackSuggestion.include({
+    xmlDependencies: WebsiteEventTrackSuggestion.prototype.xmlDependencies.concat([
+        '/website_event_track_live_quiz/static/src/xml/website_event_track_live_templates.xml',
+    ]),
+    events: _.extend({}, WebsiteEventTrackSuggestion.prototype.events, {
+        'click .owevent_track_suggestion_quiz': '_onQuizClick'
+    }),
+
+    init: function (parent, options) {
+        this._super(...arguments);
+        this.currentTrack.showQuiz = options.current_track.show_quiz;
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * If the user takes the quiz, stop the next suggestion timer
+     */
+    _onQuizClick: function () {
+        clearInterval(this.timerInterval);
+        this.$('.owevent_track_suggestion_timer_text_wrapper').remove();
+    }
+});
+
+return WebsiteEventTrackSuggestionLiveQuiz;
+
+});
diff --git a/addons/website_event_track_live_quiz/static/src/xml/website_event_track_live_templates.xml b/addons/website_event_track_live_quiz/static/src/xml/website_event_track_live_templates.xml
new file mode 100644
index 00000000000..91c37f78bc0
--- /dev/null
+++ b/addons/website_event_track_live_quiz/static/src/xml/website_event_track_live_templates.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+<t t-extend="website_event_track_live.website_event_track_suggestion">
+    <t t-jquery="a.owevent_track_suggestion_replay" t-operation="before">
+        <a t-if="widget.currentTrack.showQuiz" class="btn btn-primary btn-lg mr-2 owevent_track_suggestion_quiz"
+           href="#we_track_quiz_container"
+           onclick="$('.o_quiz_js_quiz_container').removeClass('d-none');">
+            <span>Take the Quiz</span>
+        </a>
+    </t>
+</t>
+
+</odoo>
diff --git a/addons/website_event_track_live_quiz/static/src/xml/website_event_track_quiz_templates.xml b/addons/website_event_track_live_quiz/static/src/xml/website_event_track_quiz_templates.xml
new file mode 100644
index 00000000000..a1524d14621
--- /dev/null
+++ b/addons/website_event_track_live_quiz/static/src/xml/website_event_track_quiz_templates.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+<t t-extend="quiz.validation">
+    <t t-jquery="button.o_quiz_js_quiz_reset" t-operation="after">
+        <a t-if="widget.nextSuggestion"
+            t-attf-class="btn border o_quiz_js_quiz_next_track #{widget.track.completed ? 'btn-secondary' : 'btn-light'}"
+            t-att-href="widget.nextSuggestion.suggestion.website_url">
+            Next Track
+        </a>
+    </t>
+</t>
+
+</odoo>
diff --git a/addons/website_event_track_live_quiz/views/assets.xml b/addons/website_event_track_live_quiz/views/assets.xml
new file mode 100644
index 00000000000..7609ee3c03f
--- /dev/null
+++ b/addons/website_event_track_live_quiz/views/assets.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<odoo>
+
+<template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Track Live Quiz Assets Frontend">
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js"></script>
+        <script type="text/javascript" src="/website_event_track_live_quiz/static/src/js/event_quiz.js"></script>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_live_quiz/views/event_track_templates_page.xml b/addons/website_event_track_live_quiz/views/event_track_templates_page.xml
new file mode 100644
index 00000000000..7bd968af4a0
--- /dev/null
+++ b/addons/website_event_track_live_quiz/views/event_track_templates_page.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_track_content"
+    name="Main Description: tweak quiz"
+    inherit_id="website_event_track_quiz.event_track_content">
+    <xpath expr="//div[hasclass('o_we_track_quiz_button')]" position="attributes">
+        <attribute name="t-if">track.quiz_id and not track.is_quiz_completed and not track.is_track_upcoming and (not track.is_track_live or track.is_youtube_replay or not track.youtube_video_id)</attribute>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_online/__init__.py b/addons/website_event_track_online/__init__.py
new file mode 100644
index 00000000000..5a31f331a2a
--- /dev/null
+++ b/addons/website_event_track_online/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
+from . import models
+from . import tests
diff --git a/addons/website_event_track_online/__manifest__.py b/addons/website_event_track_online/__manifest__.py
new file mode 100644
index 00000000000..8ad731cd362
--- /dev/null
+++ b/addons/website_event_track_online/__manifest__.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Tracks Online',
+    'category': 'Marketing/Events',
+    'sequence': 1003,
+    'version': '1.0',
+    'summary': 'Bridge module to support Online Events Tracks',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        'sms',
+        'website_event_online',
+        'website_event_track',
+    ],
+    'data': [
+        'data/event_sponsor_type_data.xml',
+        'data/event_track_stage_data.xml',
+        'security/ir.model.access.csv',
+        'views/assets.xml',
+        'views/event_event_views.xml',
+        'views/event_sponsor_views.xml',
+        'views/event_sponsor_type_views.xml',
+        'views/event_templates_registration.xml',
+        'views/event_track_stage_views.xml',
+        'views/event_track_templates_reminder.xml',
+        'views/event_track_templates.xml',
+        'views/event_track_templates_agenda.xml',
+        'views/event_track_templates_reminder.xml',
+        'views/event_track_views.xml',
+        'views/event_track_tag_views.xml',
+        'views/event_track_visitor_views.xml',
+        'views/event_type_views.xml',
+        'views/website_visitor_views.xml',
+        'views/event_menus.xml',
+    ],
+    'demo': [
+        'data/event_sponsor_demo.xml',
+        'data/event_track_demo.xml',
+        'data/event_track_tag_demo.xml',
+        'data/event_track_visitor_demo.xml',
+    ],
+    'application': False,
+    'installable': True,
+}
diff --git a/addons/website_event_track_online/controllers/__init__.py b/addons/website_event_track_online/controllers/__init__.py
new file mode 100644
index 00000000000..074cc5bfa61
--- /dev/null
+++ b/addons/website_event_track_online/controllers/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_track
+from . import community
diff --git a/addons/website_event_track_online/controllers/community.py b/addons/website_event_track_online/controllers/community.py
new file mode 100644
index 00000000000..2720a94931f
--- /dev/null
+++ b/addons/website_event_track_online/controllers/community.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.website_event.controllers.main import WebsiteEventController
+from odoo import fields, http, modules, tools
+from odoo.http import request
+
+class WebsiteEventCommunityController(http.Controller):
+
+    @http.route('/event/<model("event.event"):event>/community', type="http", auth="public", website=True)
+    def community(self, event, lang=None, **kwargs):
+        """ This skeleton route will be overriden in website_event_track_quiz, website_event_meet and website_event_meet_quiz. """
+        return request.render('website.page_404')
diff --git a/addons/website_event_track_online/controllers/event_track.py b/addons/website_event_track_online/controllers/event_track.py
new file mode 100644
index 00000000000..9b79a5650da
--- /dev/null
+++ b/addons/website_event_track_online/controllers/event_track.py
@@ -0,0 +1,275 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import json
+
+from werkzeug.exceptions import Forbidden, NotFound
+from datetime import timedelta
+import pytz
+
+from odoo import exceptions, http, fields
+from odoo.addons.website_event_track.controllers.main import WebsiteEventTrackController
+from odoo.http import request
+from odoo.modules.module import get_module_resource
+from odoo.tools import ustr
+from odoo.tools.translate import _
+
+
+class EventTrackOnlineController(WebsiteEventTrackController):
+
+    def _event_agenda_get_tracks(self, event):
+        tracks_sudo = event.sudo().track_ids
+        if not request.env.user.has_group('event.group_event_manager'):
+            tracks_sudo = tracks_sudo.filtered(lambda track: track.is_published or track.stage_id.is_accepted)
+        return tracks_sudo
+
+    def time_slot_rounder(self, time, rounded_minutes):
+        """ Rounds to nearest hour by adding a timedelta hour if minute >= rounded_minutes
+            E.g. : If rounded_minutes = 15 -> 09:26:00 becomes 09:30:00
+                                              09:17:00 becomes 09:15:00
+        """
+        return (time.replace(second=0, microsecond=0, minute=0, hour=time.hour)
+                + timedelta(minutes=rounded_minutes * (time.minute // rounded_minutes)))
+
+    def _split_track_by_days(self, track, local_tz):
+        """
+        Based on the track start_date and the duration,
+        split the track duration into :
+            start_time by day : number of time slot (15 minutes) that the track takes on that day.
+        E.g. :  start date = 01-01-2000 10:00 PM and duration = 3 hours
+                return {
+                    01-01-2000 10:00:00 PM: 8 (2 * 4),
+                    01-02-2000 00:00:00 AM: 4 (1 * 4)
+                }
+        Also return a set of all the time slots
+        """
+        start_date = fields.Datetime.from_string(track.date).replace(tzinfo=pytz.utc).astimezone(local_tz)
+        start_datetime = self.time_slot_rounder(start_date, 15)
+        end_datetime = self.time_slot_rounder(start_datetime + timedelta(hours=(track.duration or 0.25)), 15)
+        time_slots_count = int(((end_datetime - start_datetime).total_seconds() / 3600) * 4)
+
+        time_slots_by_day_start_time = {start_datetime: 0}
+        for i in range(0, time_slots_count):
+            # If the new time slot is still on the current day
+            next_day = (start_datetime + timedelta(days=1)).date()
+            if (start_datetime + timedelta(minutes=15*i)).date() <= next_day:
+                time_slots_by_day_start_time[start_datetime] += 1
+            else:
+                start_datetime = next_day.datetime()
+                time_slots_by_day_start_time[start_datetime] = 0
+
+        return time_slots_by_day_start_time
+
+    def _get_occupied_cells(self, track, rowspan, locations, local_tz):
+        """
+        In order to use only once the cells that the tracks will occupy, we need to reserve those cells
+        (time_slot, location) coordinate. Those coordinated will be given to the template to avoid adding
+        blank cells where already occupied by a track.
+        """
+        occupied_cells = []
+
+        start_date = fields.Datetime.from_string(track.date).replace(tzinfo=pytz.utc).astimezone(local_tz)
+        start_date = self.time_slot_rounder(start_date, 15)
+        for i in range(0, rowspan):
+            time_slot = start_date + timedelta(minutes=15*i)
+            if track.location_id:
+                occupied_cells.append((time_slot, track.location_id))
+            # when no location, reserve all locations
+            else:
+                occupied_cells += [(time_slot, location) for location in locations if location]
+
+        return occupied_cells
+
+    def _prepare_calendar_values(self, event):
+        """
+         Override that should completely replace original method in v14.
+
+        This methods slit the day (max end time - min start time) into 15 minutes time slots.
+        For each time slot, we assign the tracks that start at this specific time slot, and we add the number
+        of time slot that the track covers (track duration / 15 min)
+        The calendar will be divided into rows of 15 min, and the talks will cover the corresponding number of rows
+        (15 min slots).
+        """
+        event = event.with_context(tz=event.date_tz or 'UTC')
+        local_tz = pytz.timezone(event.date_tz or 'UTC')
+        lang_code = request.env.context.get('lang')
+        event_track_ids = self._event_agenda_get_tracks(event)
+
+        locations = list(set(track.location_id for track in event_track_ids))
+        locations.sort(key=lambda x: x.id)
+
+        # First split day by day (based on start time)
+        time_slots_by_tracks = {track: self._split_track_by_days(track, local_tz) for track in event_track_ids}
+
+        # extract all the tracks time slots
+        track_time_slots = set().union(*(time_slot.keys() for time_slot in [time_slots for time_slots in time_slots_by_tracks.values()]))
+
+        # extract unique days
+        days = list(set(time_slot.date() for time_slot in track_time_slots))
+        days.sort()
+
+        # Create the dict that contains the tracks at the correct time_slots / locations coordinates
+        tracks_by_days = dict.fromkeys(days, 0)
+        time_slots_by_day = dict((day, dict(start=set(), end=set())) for day in days)
+        tracks_by_rounded_times = dict((time_slot, dict((location, {}) for location in locations)) for time_slot in track_time_slots)
+        for track, time_slots in time_slots_by_tracks.items():
+            start_date = fields.Datetime.from_string(track.date).replace(tzinfo=pytz.utc).astimezone(local_tz)
+            end_date = start_date + timedelta(hours=(track.duration or 0.25))
+
+            for time_slot, duration in time_slots.items():
+                tracks_by_rounded_times[time_slot][track.location_id][track] = {
+                    'rowspan': duration,  # rowspan
+                    'start_date': self._get_locale_time(start_date, lang_code),
+                    'end_date': self._get_locale_time(end_date, lang_code),
+                    'occupied_cells': self._get_occupied_cells(track, duration, locations, local_tz)
+                }
+
+                # get all the time slots by day to determine the max duration of a day.
+                day = time_slot.date()
+                time_slots_by_day[day]['start'].add(time_slot)
+                time_slots_by_day[day]['end'].add(time_slot+timedelta(minutes=15*duration))
+                tracks_by_days[day] += 1
+
+        # split days into 15 minutes time slots
+        global_time_slots_by_day = dict((day, {}) for day in days)
+        for day, time_slots in time_slots_by_day.items():
+            start_time_slot = min(time_slots['start'])
+            end_time_slot = max(time_slots['end'])
+
+            time_slots_count = int(((end_time_slot - start_time_slot).total_seconds() / 3600) * 4)
+            current_time_slot = start_time_slot
+            for i in range(0, time_slots_count + 1):
+                global_time_slots_by_day[day][current_time_slot] = tracks_by_rounded_times.get(current_time_slot, {})
+                global_time_slots_by_day[day][current_time_slot]['formatted_time'] = self._get_locale_time(current_time_slot, lang_code)
+                current_time_slot = current_time_slot + timedelta(minutes=15)
+
+        # count the number of tracks by days
+        tracks_by_days = dict.fromkeys(days, 0)
+        for track in event_track_ids:
+            track_day = fields.Datetime.from_string(track.date).replace(tzinfo=pytz.utc).astimezone(local_tz).date()
+            tracks_by_days[track_day] += 1
+
+        return {
+            'days': days,
+            'tracks_by_days': tracks_by_days,
+            'time_slots': global_time_slots_by_day,
+            'locations': locations
+        }
+
+    @http.route(['''/event/<model("event.event"):event>/agenda'''], type='http', auth="public", website=True, sitemap=False)
+    def event_agenda(self, event, tag=None, **post):
+        if not event.can_access_from_current_website():
+            raise NotFound()
+
+        event = event.with_context(tz=event.date_tz or 'UTC')
+        vals = {
+            'event': event,
+            'main_object': event,
+            'tag': tag,
+            'user_event_manager': request.env.user.has_group('event.group_event_manager'),
+        }
+
+        vals.update(self._prepare_calendar_values(event))
+
+        return request.render("website_event_track_online.agenda_online", vals)
+
+    def _fetch_track(self, track_id, allow_is_accepted=False):
+        track = request.env['event.track'].browse(track_id).exists()
+        if not track:
+            raise NotFound()
+        try:
+            track.check_access_rights('read')
+            track.check_access_rule('read')
+        except exceptions.AccessError:
+            track_sudo = track.sudo()
+            if allow_is_accepted and track_sudo.is_accepted:
+                track = track_sudo
+            else:
+                raise Forbidden()
+
+        event = track.event_id
+        # JSON RPC have no website in requests
+        if hasattr(request, 'website_id') and not event.can_access_from_current_website():
+            raise NotFound()
+        try:
+            event.check_access_rights('read')
+            event.check_access_rule('read')
+        except exceptions.AccessError:
+            raise Forbidden()
+
+        return track
+
+    @http.route("/event/track/toggle_reminder", type="json", auth="public", website=True)
+    def track_reminder_toggle(self, track_id, set_reminder_on):
+        """ Set a reminder a track for current visitor. Track visitor is created or updated
+        if it already exists. Exception made if un-wishlisting and no track_visitor
+        record found (should not happen unless manually done).
+
+        :param boolean set_reminder_on:
+          If True, set as a wishlist, otherwise un-wishlist track;
+          If the track is a Key Track (wishlisted_by_default):
+            if set_reminder_on = False, blacklist the track_partner
+            otherwise, un-blacklist the track_partner
+        """
+        track = self._fetch_track(track_id, allow_is_accepted=True)
+        force_create = set_reminder_on or track.wishlisted_by_default
+        event_track_partner = track._get_event_track_visitors(force_create=force_create)
+        visitor_sudo = event_track_partner.visitor_id
+
+        if not track.wishlisted_by_default:
+            if not event_track_partner or event_track_partner.is_wishlisted == set_reminder_on:  # ignore if new state = old state
+                return {'error': 'ignored'}
+            event_track_partner.is_wishlisted = set_reminder_on
+        else:
+            if not event_track_partner or event_track_partner.is_blacklisted != set_reminder_on:  # ignore if new state = old state
+                return {'error': 'ignored'}
+            event_track_partner.is_blacklisted = not set_reminder_on
+
+        result = {'reminderOn': set_reminder_on}
+        if request.httprequest.cookies.get('visitor_uuid', '') != visitor_sudo.access_token:
+            result['visitor_uuid'] = visitor_sudo.access_token
+
+        return result
+
+    @http.route('/event/manifest.webmanifest', type='http', auth='public', methods=['GET'], website=True, sitemap=False)
+    def webmanifest(self):
+        """ Returns a WebManifest describing the metadata associated with a web application.
+        Using this metadata, user agents can provide developers with means to create user 
+        experiences that are more comparable to that of a native application.
+        """
+        company = request.env.company
+        website = request.website
+        manifest = {
+            'name': _('%s Online Events') % company.name,
+            'short_name': company.name,
+            'description': _('%s Online Events') % company.name,
+            'scope': '/event',
+            'start_url': '/event',
+            'display': 'standalone',
+            'background_color': '#ffffff',
+            'theme_color': '#875A7B',
+        }
+        icon_sizes = ['192x192', '512x512']
+        manifest['icons'] = [{
+            'src': website.image_url(website, 'app_icon', size=size),
+            'sizes': size,
+            'type': 'image/png',
+        } for size in icon_sizes]
+        body = json.dumps(manifest, default=ustr)
+        response = request.make_response(body, [
+            ('Content-Type', 'application/manifest+json'),
+        ])
+        return response
+
+    @http.route('/event/service-worker.js', type='http', auth='public', methods=['GET'], website=True, sitemap=False)
+    def service_worker(self):
+        """ Returns a ServiceWorker javascript file scoped for website_event
+        """
+        sw_file = get_module_resource('website_event_track_online', 'static/src/js/service_worker.js')
+        with open(sw_file, 'rb') as fp:
+            body = fp.read()
+        response = request.make_response(body, [
+            ('Content-Type', 'text/javascript'),
+            ('Service-Worker-Allowed', '/event'),
+        ])
+        return response
diff --git a/addons/website_event_track_online/data/event_sponsor_demo.xml b/addons/website_event_track_online/data/event_sponsor_demo.xml
new file mode 100644
index 00000000000..f2576038acf
--- /dev/null
+++ b/addons/website_event_track_online/data/event_sponsor_demo.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="website_event_track.event_7_sponsor_0" model="event.sponsor">
+        <field name="partner_id" ref="base.res_partner_1"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_1" model="event.sponsor">
+        <field name="partner_id" ref="base.res_partner_2"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_2" model="event.sponsor">
+        <field name="partner_id" ref="base.res_partner_3"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_3" model="event.sponsor">
+        <field name="partner_id" ref="base.res_partner_4"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_4" model="event.sponsor">
+        <field name="partner_id" ref="base.res_partner_10"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_5" model="event.sponsor">
+        <field name="partner_id" ref="base.res_partner_12"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_6" model="event.sponsor">
+        <field name="partner_id" ref="event.res_partner_event_1"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_7" model="event.sponsor">
+        <field name="partner_id" ref="event.res_partner_event_2"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_8" model="event.sponsor">
+        <field name="partner_id" ref="event.res_partner_event_3"/>
+    </record>
+    <record id="website_event_track.event_7_sponsor_9" model="event.sponsor">
+        <field name="partner_id" ref="event.res_partner_event_4"/>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/data/event_sponsor_type_data.xml b/addons/website_event_track_online/data/event_sponsor_type_data.xml
new file mode 100644
index 00000000000..da1a8915d8a
--- /dev/null
+++ b/addons/website_event_track_online/data/event_sponsor_type_data.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="website_event_track.event_sponsor_type1" model="event.sponsor.type">
+        <field name="display_ribbon_style">Bronze</field>
+    </record>
+    <record id="website_event_track.event_sponsor_type2" model="event.sponsor.type">
+        <field name="display_ribbon_style">Silver</field>
+    </record>
+    <record id="website_event_track.event_sponsor_type3" model="event.sponsor.type">
+        <field name="display_ribbon_style">Gold</field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/data/event_track_demo.xml b/addons/website_event_track_online/data/event_track_demo.xml
new file mode 100644
index 00000000000..2b63d8c1c44
--- /dev/null
+++ b/addons/website_event_track_online/data/event_track_demo.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="website_event_track.event_7_track_1" model="event.track">
+        <field name="wishlisted_by_default" eval="True"/>
+        <field name="partner_id" ref="base.res_partner_address_15"/>
+    </record>
+    <record id="website_event_track.event_7_track_2" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_28"/>
+    </record>
+    <record id="website_event_track.event_7_track_3" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_16"/>
+    </record>
+    <record id="website_event_track.event_7_track_4" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_15"/>
+    </record>
+    <record id="website_event_track.event_7_track_5" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_28"/>
+    </record>
+    <record id="website_event_track.event_7_track_6" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_15"/>
+    </record>
+    <record id="website_event_track.event_7_track_7" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_3"/>
+    </record>
+    <record id="website_event_track.event_7_track_8" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_4"/>
+    </record>
+    <record id="website_event_track.event_7_track_l3_1" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_31"/>
+    </record>
+    <record id="website_event_track.event_7_track_l3_2" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_18"/>
+    </record>
+    <record id="website_event_track.event_7_track_10" model="event.track">
+        <field name="wishlisted_by_default" eval="True"/>
+        <field name="partner_id" ref="base.res_partner_address_28"/>
+    </record>
+    <record id="website_event_track.event_7_track_11" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_16"/>
+    </record>
+    <record id="website_event_track.event_7_track_12" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_15"/>
+    </record>
+    <record id="website_event_track.event_7_track_13" model="event.track">
+        <field name="wishlisted_by_default" eval="True"/>
+        <field name="partner_id" ref="base.res_partner_address_16"/>
+    </record>
+    <record id="website_event_track.event_7_track_14" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_3"/>
+    </record>
+    <record id="website_event_track.event_7_track_15" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_16"/>
+    </record>
+    <record id="website_event_track.event_7_track_16" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_31"/>
+    </record>
+    <record id="website_event_track.event_7_track_17" model="event.track">
+        <field name="wishlisted_by_default" eval="True"/>
+        <field name="partner_id" ref="base.res_partner_address_17"/>
+    </record>
+    <record id="website_event_track.event_7_track_l3_10" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_31"/>
+    </record>
+    <record id="website_event_track.event_7_track_l3_11" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_3"/>
+    </record>
+    <record id="website_event_track.event_7_track_20" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_28"/>
+    </record>
+    <record id="website_event_track.event_7_track_21" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_3"/>
+    </record>
+    <record id="website_event_track.event_7_track_22" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_4"/>
+    </record>
+    <record id="website_event_track.event_7_track_23" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_4"/>
+    </record>
+    <record id="website_event_track.event_7_track_24" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_17"/>
+    </record>
+    <record id="website_event_track.event_7_track_25" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_18"/>
+    </record>
+    <record id="website_event_track.event_7_track_26" model="event.track">
+        <field name="partner_id" ref="base.res_partner_address_17"/>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/data/event_track_stage_data.xml b/addons/website_event_track_online/data/event_track_stage_data.xml
new file mode 100644
index 00000000000..b9f12bf3b82
--- /dev/null
+++ b/addons/website_event_track_online/data/event_track_stage_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data noupdate="1">
+
+    <record id="website_event_track.event_track_stage2" model="event.track.stage">
+        <field name="is_accepted" eval="True"/>
+    </record>
+    <record id="website_event_track.event_track_stage3" model="event.track.stage">
+        <field name="is_accepted" eval="True"/>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/data/event_track_tag_demo.xml b/addons/website_event_track_online/data/event_track_tag_demo.xml
new file mode 100644
index 00000000000..35408f450dc
--- /dev/null
+++ b/addons/website_event_track_online/data/event_track_tag_demo.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="event_track_tag_category_1" model="event.track.tag.category">
+        <field name="name">Audience</field>
+        <field name="sequence">10</field>
+    </record>
+    <record id="event_track_tag_category_2" model="event.track.tag.category">
+        <field name="name">Format</field>
+        <field name="sequence">20</field>
+    </record>
+
+    <record id="website_event_track.event_track_tag1" model="event.track.tag">
+        <field name="category_id" ref="website_event_track_online.event_track_tag_category_1"/>
+        <field name="sequence">1</field>
+    </record>
+    <record id="website_event_track.event_track_tag2" model="event.track.tag">
+        <field name="category_id" ref="website_event_track_online.event_track_tag_category_1"/>
+        <field name="sequence">2</field>
+    </record>
+    <record id="website_event_track.event_track_tag3" model="event.track.tag">
+        <field name="category_id" ref="website_event_track_online.event_track_tag_category_1"/>
+        <field name="sequence">3</field>
+    </record>
+    <record id="website_event_track.event_track_tag11" model="event.track.tag">
+        <field name="category_id" ref="website_event_track_online.event_track_tag_category_2"/>
+        <field name="sequence">11</field>
+    </record>
+    <record id="website_event_track.event_track_tag12" model="event.track.tag">
+        <field name="category_id" ref="website_event_track_online.event_track_tag_category_2"/>
+        <field name="sequence">12</field>
+    </record>
+    <record id="website_event_track.event_track_tag13" model="event.track.tag">
+        <field name="category_id" ref="website_event_track_online.event_track_tag_category_2"/>
+        <field name="sequence">13</field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/data/event_track_visitor_demo.xml b/addons/website_event_track_online/data/event_track_visitor_demo.xml
new file mode 100644
index 00000000000..3217d3ce709
--- /dev/null
+++ b/addons/website_event_track_online/data/event_track_visitor_demo.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="event_7_track_2_visitor_0" model="event.track.visitor">
+        <field name="track_id" ref="website_event_track.event_7_track_2"/>
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_0"/>
+        <field name="is_wishlisted" eval="True"/>
+    </record>
+    <record id="event_7_track_2_visitor_2" model="event.track.visitor">
+        <field name="track_id" ref="website_event_track.event_7_track_2"/>
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_2"/>
+        <field name="is_wishlisted" eval="True"/>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/models/__init__.py b/addons/website_event_track_online/models/__init__.py
new file mode 100644
index 00000000000..c8add27a1e3
--- /dev/null
+++ b/addons/website_event_track_online/models/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_event
+from . import event_sponsor
+from . import event_sponsor_type
+from . import event_track_visitor
+from . import event_track
+from . import event_track_stage
+from . import event_track_tag
+from . import event_type
+from . import website
+from . import website_event_menu
+from . import website_visitor
diff --git a/addons/website_event_track_online/models/event_event.py b/addons/website_event_track_online/models/event_event.py
new file mode 100644
index 00000000000..36899d5e86b
--- /dev/null
+++ b/addons/website_event_track_online/models/event_event.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields, api, _
+from odoo.addons.http_routing.models.ir_http import slug
+
+
+class EventEvent(models.Model):
+    _inherit = "event.event"
+
+    community_menu = fields.Boolean(
+        "Community Menu", compute="_compute_community_menu",
+        readonly=False, store=True,
+        help="Display community tab on website")
+    community_menu_ids = fields.One2many(
+        "website.event.menu", "event_id", string="Event Community Menus",
+        domain=[("menu_type", "=", "community")])
+
+    @api.depends("event_type_id", "website_menu", "community_menu")
+    def _compute_community_menu(self):
+        """ At type onchange: synchronize. At website_menu update: synchronize. """
+        for event in self:
+            if event.event_type_id and event.event_type_id != event._origin.event_type_id:
+                event.community_menu = event.event_type_id.community_menu
+            elif event.website_menu and event.website_menu != event._origin.website_menu or not event.community_menu:
+                event.community_menu = True
+            elif not event.website_menu:
+                event.community_menu = False
+
+    # ------------------------------------------------------------
+    # WEBSITE MENU MANAGEMENT
+    # ------------------------------------------------------------
+
+    # OVERRIDES: ADD SEQUENCE
+
+    def _get_menu_update_fields(self):
+        update_fields = super(EventEvent, self)._get_menu_update_fields()
+        update_fields += ['community_menu']
+        return update_fields
+
+    def _update_website_menus(self, menus_update_by_field=None):
+        super(EventEvent, self)._update_website_menus(menus_update_by_field=menus_update_by_field)
+        for event in self:
+            if not menus_update_by_field or event in menus_update_by_field.get('community_menu'):
+                event._update_website_menu_entry('community_menu', 'community_menu_ids', '_get_community_menu_entries')
+
+    def _get_menu_type_field_matching(self):
+        res = super(EventEvent, self)._get_menu_type_field_matching()
+        res['community'] = 'community_menu'
+        return res
+
+    def _get_community_menu_entries(self):
+        self.ensure_one()
+        return [(_('Community'), '/event/%s/community' % slug(self), False, 80, 'community')]
+
+    def _get_track_menu_entries(self):
+        """ Remove agenda as this is now managed separately """
+        self.ensure_one()
+        return [
+            (_('Talks'), '/event/%s/track' % slug(self), False, 10, 'track'),
+            (_('Agenda'), '/event/%s/agenda' % slug(self), False, 70, False)
+        ]
+
+    def _get_track_proposal_menu_entries(self):
+        """ See website_event_track._get_track_menu_entries() """
+        self.ensure_one()
+        return [(_('Talk Proposals'), '/event/%s/track_proposal' % slug(self), False, 15, 'track_proposal')]
diff --git a/addons/website_event_track_online/models/event_sponsor.py b/addons/website_event_track_online/models/event_sponsor.py
new file mode 100644
index 00000000000..16bec7c9fe4
--- /dev/null
+++ b/addons/website_event_track_online/models/event_sponsor.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+from odoo.modules.module import get_resource_path
+
+
+class Sponsor(models.Model):
+    _name = 'event.sponsor'
+    _inherit = ['event.sponsor']
+
+    # contact information
+    name = fields.Char('Sponsor Name', compute='_compute_name', readonly=False, store=True)
+    email = fields.Char('Sponsor Email', compute='_compute_email', readonly=False, store=True)
+    phone = fields.Char('Sponsor Phone', compute='_compute_phone', readonly=False, store=True)
+    mobile = fields.Char('Sponsor Mobile', compute='_compute_mobile', readonly=False, store=True)
+    # image
+    image_512 = fields.Image(
+        string="Logo", max_width=512, max_height=512,
+        compute='_compute_image_512', readonly=False, store=True)
+    image_256 = fields.Image("Image 256", related="image_512", max_width=256, max_height=256, store=False)
+    image_128 = fields.Image("Image 128", related="image_512", max_width=128, max_height=128, store=False)
+    website_image_url = fields.Char(
+        string='Image URL', max_width=256, max_height=256,
+        compute='_compute_website_image_url', compute_sudo=True, store=False)
+
+    @api.depends('partner_id')
+    def _compute_name(self):
+        self._synchronize_with_partner('name')
+
+    @api.depends('partner_id')
+    def _compute_email(self):
+        self._synchronize_with_partner('email')
+
+    @api.depends('partner_id')
+    def _compute_phone(self):
+        self._synchronize_with_partner('phone')
+
+    @api.depends('partner_id')
+    def _compute_mobile(self):
+        self._synchronize_with_partner('mobile')
+
+    @api.depends('partner_id')
+    def _compute_image_512(self):
+        self._synchronize_with_partner('image_512')
+
+    @api.depends('image_256', 'partner_id.image_256')
+    def _compute_website_image_url(self):
+        for sponsor in self:
+            if sponsor.image_256:
+                sponsor.website_image_url = self.env['website'].image_url(sponsor, 'image_256', size=256)
+            elif sponsor.partner_id.image_256:
+                sponsor.website_image_url = self.env['website'].image_url(sponsor.partner_id, 'image_256', size=256)
+            else:
+                sponsor.website_image_url = get_resource_path('website_event_track', 'static/src/img', 'event_sponsor_default_%d.png' % (sponsor.id % 1))
+
+    def _synchronize_with_partner(self, fname):
+        """ Synchronize with partner if not set. Setting a value does not write
+        on partner as this may be event-specific information. """
+        for sponsor in self:
+            if not sponsor[fname]:
+                sponsor[fname] = sponsor.partner_id[fname]
diff --git a/addons/website_event_track_online/models/event_sponsor_type.py b/addons/website_event_track_online/models/event_sponsor_type.py
new file mode 100644
index 00000000000..dc5d0355841
--- /dev/null
+++ b/addons/website_event_track_online/models/event_sponsor_type.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class SponsorType(models.Model):
+    _inherit = "event.sponsor.type"
+
+    display_ribbon_style = fields.Selection([
+        ('no_ribbon', 'No Ribbon'),
+        ('Gold', 'Gold'),
+        ('Silver', 'Silver'),
+        ('Bronze', 'Bronze')], string='Ribbon Style')
diff --git a/addons/website_event_track_online/models/event_track.py b/addons/website_event_track_online/models/event_track.py
new file mode 100644
index 00000000000..131abf0ee2f
--- /dev/null
+++ b/addons/website_event_track_online/models/event_track.py
@@ -0,0 +1,195 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+from odoo.osv import expression
+from odoo.tools.mail import is_html_empty
+from odoo.modules.module import get_resource_path
+
+
+class Track(models.Model):
+    _name = "event.track"
+    _inherit = ['event.track']
+
+    # status management
+    is_accepted = fields.Boolean('Is Accepted', related='stage_id.is_accepted', readonly=True)
+    # speaker
+    partner_biography = fields.Html(
+        string='Biography', compute='_compute_partner_biography',
+        readonly=False, store=True)
+    image = fields.Image(
+        string="Speaker Photo", compute="_compute_speaker_image",
+        readonly=False, store=True,
+        max_width=256, max_height=256)
+    # frontend description
+    website_image = fields.Image(string="Website Image", max_width=1024, max_height=1024)
+    website_image_url = fields.Char(
+        string='Image URL', compute='_compute_website_image_url',
+        compute_sudo=True, store=False)
+    # wishlist / visitors management
+    event_track_visitor_ids = fields.One2many(
+        'event.track.visitor', 'track_id', string="Track Visitors",
+        groups="event.group_event_user")
+    is_reminder_on = fields.Boolean('Is Reminder On', compute='_compute_is_reminder_on')
+    wishlist_visitor_ids = fields.Many2many(
+        'website.visitor', string="Visitor Wishlist",
+        compute="_compute_wishlist_visitor_ids", compute_sudo=True,
+        search="_search_wishlist_visitor_ids",
+        groups="event.group_event_user")
+    wishlist_visitor_count = fields.Integer(
+        string="# Wishlisted",
+        compute="_compute_wishlist_visitor_ids", compute_sudo=True,
+        groups="event.group_event_user")
+    wishlisted_by_default = fields.Boolean(
+        string='Always Wishlisted',
+        help="""If set, the talk will be starred for each attendee registered to the event. The attendee won't be able to un-star this talk.""")
+
+    # SPEAKER
+
+    @api.depends('partner_id')
+    def _compute_partner_biography(self):
+        for track in self:
+            if not track.partner_biography:
+                track.partner_biography = track.partner_id.website_description
+            elif track.partner_id and is_html_empty(track.partner_biography) and \
+                not is_html_empty(track.partner_id.website_description):
+                track.partner_biography = track.partner_id.website_description
+
+    @api.depends('partner_id')
+    def _compute_speaker_image(self):
+        for track in self:
+            if not track.image:
+                track.image = track.partner_id.image_256
+
+    # FRONTEND DESCRIPTION
+
+    @api.depends('image', 'partner_id.image_256')
+    def _compute_website_image_url(self):
+        for track in self:
+            if track.website_image:
+                track.website_image_url = self.env['website'].image_url(track, 'website_image', size=1024)
+            else:
+                track.website_image_url = '/website_event_track/static/src/img/event_track_default_%d.jpeg' % (track.id % 2)
+
+    # WISHLIST / VISITOR MANAGEMENT
+
+    @api.depends('wishlisted_by_default', 'event_track_visitor_ids.visitor_id',
+                 'event_track_visitor_ids.partner_id', 'event_track_visitor_ids.is_wishlisted',
+                 'event_track_visitor_ids.is_blacklisted')
+    @api.depends_context('uid')
+    def _compute_is_reminder_on(self):
+        current_visitor = self.env['website.visitor']._get_visitor_from_request(force_create=False)
+        if self.env.user._is_public() and not current_visitor:
+            for track in self:
+                track.is_reminder_on = track.wishlisted_by_default
+        else:
+            if self.env.user._is_public():
+                domain = [('visitor_id', '=', current_visitor.id)]
+            elif current_visitor:
+                domain = [
+                    '|',
+                    ('partner_id', '=', self.env.user.partner_id.id),
+                    ('visitor_id', '=', current_visitor.id)
+                ]
+            else:
+                domain = [('partner_id', '=', self.env.user.partner_id.id)]
+
+            event_track_visitors = self.env['event.track.visitor'].sudo().search_read(
+                expression.AND([
+                    domain,
+                    [('track_id', 'in', self.ids)]
+                ]), fields=['track_id', 'is_wishlisted', 'is_blacklisted']
+            )
+
+            wishlist_map = {
+                track_visitor['track_id'][0]: {
+                    'is_wishlisted': track_visitor['is_wishlisted'],
+                    'is_blacklisted': track_visitor['is_blacklisted']
+                } for track_visitor in event_track_visitors
+            }
+            for track in self:
+                if wishlist_map.get(track.id):
+                    track.is_reminder_on = wishlist_map.get(track.id)['is_wishlisted'] or (track.wishlisted_by_default and not wishlist_map[track.id]['is_blacklisted'])
+                else:
+                    track.is_reminder_on = track.wishlisted_by_default
+
+    @api.depends('event_track_visitor_ids.visitor_id', 'event_track_visitor_ids.is_wishlisted')
+    def _compute_wishlist_visitor_ids(self):
+        results = self.env['event.track.visitor'].read_group(
+            [('track_id', 'in', self.ids), ('is_wishlisted', '=', True)],
+            ['track_id', 'visitor_id:array_agg'],
+            ['track_id']
+        )
+        visitor_ids_map = {result['track_id'][0]: result['visitor_id'] for result in results}
+        for track in self:
+            track.wishlist_visitor_ids = visitor_ids_map.get(track.id, [])
+            track.wishlist_visitor_count = len(visitor_ids_map.get(track.id, []))
+
+    def _search_wishlist_visitor_ids(self, operator, operand):
+        if operator == "not in":
+            raise NotImplementedError("Unsupported 'Not In' operation on track wishlist visitors")
+
+        track_visitors = self.env['event.track.visitor'].sudo().search([
+            ('visitor_id', operator, operand),
+            ('is_wishlisted', '=', True)
+        ])
+        return [('id', 'in', track_visitors.track_id.ids)]
+
+    # ------------------------------------------------------------
+    # CRUD
+    # -----------------------------------------------------------
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        tracks = super(Track, self).create(vals_list)
+
+        for track in tracks:
+            track._synchronize_with_stage(track.stage_id)
+
+        return tracks
+
+    def write(self, vals):
+        if vals.get('stage_id'):
+            stage = self.env['event.track.stage'].browse(vals['stage_id'])
+            self._synchronize_with_stage(stage)
+        return super(Track, self).write(vals)
+
+    def _synchronize_with_stage(self, stage):
+        if stage.is_done:
+            self.is_published = True
+
+    # ------------------------------------------------------------
+    # TOOLS
+    # ------------------------------------------------------------
+
+    def _get_event_track_visitors(self, force_create=False):
+        self.ensure_one()
+
+        force_visitor_create = self.env.user._is_public()
+        visitor_sudo = self.env['website.visitor']._get_visitor_from_request(force_create=force_visitor_create)
+        if visitor_sudo:
+            visitor_sudo._update_visitor_last_visit()
+
+        if self.env.user._is_public():
+            domain = [('visitor_id', '=', visitor_sudo.id)]
+        elif visitor_sudo:
+            domain = [
+                '|',
+                ('partner_id', '=', self.env.user.partner_id.id),
+                ('visitor_id', '=', visitor_sudo.id)
+            ]
+        else:
+            domain = [('partner_id', '=', self.env.user.partner_id.id)]
+
+        track_visitors = self.env['event.track.visitor'].sudo().search(
+            expression.AND([domain, [('track_id', 'in', self.ids)]])
+        )
+        missing = self - track_visitors.track_id
+        if missing and force_create:
+            track_visitors += self.env['event.track.visitor'].sudo().create([{
+                'visitor_id': visitor_sudo.id,
+                'partner_id': self.env.user.partner_id.id if not self.env.user._is_public() else False,
+                'track_id': track.id,
+            } for track in missing])
+
+        return track_visitors
diff --git a/addons/website_event_track_online/models/event_track_stage.py b/addons/website_event_track_online/models/event_track_stage.py
new file mode 100644
index 00000000000..c6e300e5b55
--- /dev/null
+++ b/addons/website_event_track_online/models/event_track_stage.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class TrackStage(models.Model):
+    _inherit = 'event.track.stage'
+
+    is_accepted = fields.Boolean(
+        string='Accepted Stage',
+        help='Accepted tracks are displayed in agenda views but not accessible.')
+    is_done = fields.Boolean(help='Done tracks are automatically published so that they are available in frontend.')
\ No newline at end of file
diff --git a/addons/website_event_track_online/models/event_track_tag.py b/addons/website_event_track_online/models/event_track_tag.py
new file mode 100644
index 00000000000..b04fb7bf251
--- /dev/null
+++ b/addons/website_event_track_online/models/event_track_tag.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class TrackTagCategory(models.Model):
+    _name = "event.track.tag.category"
+    _description = 'Event Track Tag Category'
+    _order = "sequence"
+
+    name = fields.Char("Name", required=True, translate=True)
+    sequence = fields.Integer('Sequence', default=10)
+    tag_ids = fields.One2many('event.track.tag', 'category_id', string="Tags")
+
+
+class TrackTag(models.Model):
+    _inherit = "event.track.tag"
+    _order = "category_id, sequence, name"
+
+    sequence = fields.Integer('Sequence', default=10)
+    category_id = fields.Many2one('event.track.tag.category', string="Category", ondelete="set null")
diff --git a/addons/website_event_track_online/models/event_track_visitor.py b/addons/website_event_track_online/models/event_track_visitor.py
new file mode 100644
index 00000000000..b84d7c6a4d2
--- /dev/null
+++ b/addons/website_event_track_online/models/event_track_visitor.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class TrackVisitor(models.Model):
+    """ Table linking track and visitors. """
+    _name = 'event.track.visitor'
+    _description = 'Track / Visitor Link'
+    _table = 'event_track_visitor'
+    _rec_name = 'track_id'
+    _order = 'track_id'
+
+    partner_id = fields.Many2one(
+        'res.partner', string='Partner', compute='_compute_partner_id',
+        index=True, ondelete='set null', readonly=False, store=True)
+    visitor_id = fields.Many2one(
+        'website.visitor', string='Visitor', index=True, ondelete='cascade')
+    track_id = fields.Many2one(
+        'event.track', string='Track',
+        index=True, required=True, ondelete='cascade')
+    is_wishlisted = fields.Boolean(string="Is Wishlisted")
+    is_blacklisted = fields.Boolean(string="Is reminder off", help="As key track cannot be un-wishlisted, this field store the partner choice to remove the reminder for key tracks.")
+
+    @api.depends('visitor_id')
+    def _compute_partner_id(self):
+        for track_visitor in self:
+            if track_visitor.visitor_id.partner_id and not track_visitor.partner_id:
+                track_visitor.partner_id = track_visitor.visitor_id.partner_id
+            elif not track_visitor.partner_id:
+                track_visitor.partner_id = False
diff --git a/addons/website_event_track_online/models/event_type.py b/addons/website_event_track_online/models/event_type.py
new file mode 100644
index 00000000000..9b2efc94af8
--- /dev/null
+++ b/addons/website_event_track_online/models/event_type.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class EventType(models.Model):
+    _inherit = "event.type"
+
+    community_menu = fields.Boolean(
+        "Community Menu", compute="_compute_community_menu",
+        readonly=False, store=True,
+        help="Display community tab on website")
+
+    @api.depends('website_menu')
+    def _compute_community_menu(self):
+        for event_type in self:
+            event_type.community_menu = event_type.website_menu
diff --git a/addons/website_event_track_online/models/website.py b/addons/website_event_track_online/models/website.py
new file mode 100644
index 00000000000..79102ea61f8
--- /dev/null
+++ b/addons/website_event_track_online/models/website.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+from PIL import Image
+
+from odoo import api, fields, models
+from odoo.tools import ImageProcess
+
+
+class Website(models.Model):
+    _inherit = "website"
+
+    app_icon = fields.Image(string='Website App Icon', compute='_compute_app_icon', stored=True, readonly=True, help='This field holds the image used as mobile app icon on the website (PNG format).')
+
+    @api.depends('favicon')
+    def _compute_app_icon(self):
+        """ Computes a squared image based on the favicon to be used as mobile webapp icon.
+            App Icon should be in PNG format and size of at least 512x512.
+        """
+        for website in self:
+            image = ImageProcess(website.favicon)
+            w, h = image.image.size
+            square_size = w if w > h else h
+            image.crop_resize(square_size, square_size)
+            image.image = image.image.resize((512, 512))
+            image.operationsCount += 1
+            website.app_icon = image.image_base64(output_format='PNG')
diff --git a/addons/website_event_track_online/models/website_event_menu.py b/addons/website_event_track_online/models/website_event_menu.py
new file mode 100644
index 00000000000..97c17aff19a
--- /dev/null
+++ b/addons/website_event_track_online/models/website_event_menu.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class EventMenu(models.Model):
+    _inherit = "website.event.menu"
+
+    menu_type = fields.Selection(selection_add=[
+        ('community', 'Community Menu')
+    ])
diff --git a/addons/website_event_track_online/models/website_visitor.py b/addons/website_event_track_online/models/website_visitor.py
new file mode 100644
index 00000000000..18072c86d11
--- /dev/null
+++ b/addons/website_event_track_online/models/website_visitor.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class WebsiteVisitor(models.Model):
+    _name = 'website.visitor'
+    _inherit = ['website.visitor']
+
+    event_track_visitor_ids = fields.One2many(
+        'event.track.visitor', 'visitor_id', string="Track Visitors",
+        groups='event.group_event_user')
+    event_track_wishlisted_ids = fields.Many2many(
+        'event.track', string="Wishlisted Tracks",
+        compute="_compute_event_track_wishlisted_ids", compute_sudo=True,
+        search="_search_event_track_wishlisted_ids",
+        groups="event.group_event_user")
+    event_track_wishlisted_count = fields.Integer(
+        string="# Wishlisted",
+        compute="_compute_event_track_wishlisted_ids", compute_sudo=True,
+        groups='event.group_event_user')
+
+    @api.depends('parent_id', 'event_track_visitor_ids.track_id', 'event_track_visitor_ids.is_wishlisted')
+    def _compute_event_track_wishlisted_ids(self):
+        # include parent's track visitors in a visitor o2m field. We don't add
+        # child one as child should not have track visitors (moved to the parent)
+        all_visitors = self + self.parent_id
+        results = self.env['event.track.visitor'].read_group(
+            [('visitor_id', 'in', all_visitors.ids), ('is_wishlisted', '=', True)],
+            ['visitor_id', 'track_id:array_agg'],
+            ['visitor_id']
+        )
+        track_ids_map = {result['visitor_id'][0]: result['track_id'] for result in results}
+        for visitor in self:
+            visitor_track_ids = track_ids_map.get(visitor.id, [])
+            parent_track_ids = track_ids_map.get(visitor.parent_id.id, [])
+            visitor.event_track_wishlisted_ids = visitor_track_ids + [track_id for track_id in parent_track_ids if track_id not in visitor_track_ids]
+            visitor.event_track_wishlisted_count = len(visitor.event_track_wishlisted_ids)
+
+    def _search_event_track_wishlisted_ids(self, operator, operand):
+        """ Search visitors with terms on wishlisted tracks. E.g. [('event_track_wishlisted_ids',
+        'in', [1, 2])] should return visitors having wishlisted tracks 1, 2 as
+        well as their children for notification purpose. """
+        if operator == "not in":
+            raise NotImplementedError("Unsupported 'Not In' operation on track wishlist visitors")
+
+        track_visitors = self.env['event.track.visitor'].sudo().search([
+            ('track_id', operator, operand),
+            ('is_wishlisted', '=', True)
+        ])
+        if track_visitors:
+            visitors = track_visitors.visitor_id
+            # search children, even archived one, to contact them
+            children = self.env['website.visitor'].with_context(
+                active_test=False
+            ).sudo().search([('parent_id', 'in', visitors.ids)])
+            visitor_ids = (visitors + children).ids
+        else:
+            visitor_ids = []
+
+        return [('id', 'in', visitor_ids)]
+
+    def _link_to_partner(self, partner, update_values=None):
+        """ Propagate partner update to track_visitor records """
+        if partner:
+            track_visitor_wo_partner = self.event_track_visitor_ids.filtered(lambda track_visitor: not track_visitor.partner_id)
+            if track_visitor_wo_partner:
+                track_visitor_wo_partner.partner_id = partner
+        super(WebsiteVisitor, self)._link_to_partner(partner, update_values=update_values)
+
+    def _link_to_visitor(self, target, keep_unique=True):
+        """ Override linking process to link wishlist to the final visitor. """
+        self.event_track_visitor_ids.visitor_id = target.id
+        return super(WebsiteVisitor, self)._link_to_visitor(target, keep_unique=keep_unique)
diff --git a/addons/website_event_track_online/security/ir.model.access.csv b/addons/website_event_track_online/security/ir.model.access.csv
new file mode 100644
index 00000000000..b0bd4100f47
--- /dev/null
+++ b/addons/website_event_track_online/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+event_track_visitor_access_all,event.track.visitor.access.all,model_event_track_visitor,,0,0,0,0
+event_track_visitor_access_manager,event.track.visitor.access.manager,model_event_track_visitor,event.group_event_manager,1,1,1,1
+event_track_tag_category_access_public,event.track.tag.category.access,model_event_track_tag_category,,1,0,0,0
+event_track_tag_category_access_manager,event.track.tag.category.access.manager,model_event_track_tag_category,event.group_event_manager,1,1,1,1
diff --git a/addons/website_event_track_online/static/lib/idb-keyval/idb-keyval.js b/addons/website_event_track_online/static/lib/idb-keyval/idb-keyval.js
new file mode 100644
index 00000000000..c08909dc79a
--- /dev/null
+++ b/addons/website_event_track_online/static/lib/idb-keyval/idb-keyval.js
@@ -0,0 +1,81 @@
+//     idb-keyval.js 3.2.0
+//     https://github.com/jakearchibald/idb-keyval
+//     Copyright 2016, Jake Archibald
+//     Licensed under the Apache License, Version 2.0
+
+var idbKeyval = (function (exports) {
+    'use strict';
+    
+    class Store {
+        constructor(dbName = 'keyval-store', storeName = 'keyval') {
+            this.storeName = storeName;
+            this._dbp = new Promise((resolve, reject) => {
+                const openreq = indexedDB.open(dbName, 1);
+                openreq.onerror = () => reject(openreq.error);
+                openreq.onsuccess = () => resolve(openreq.result);
+                // First time setup: create an empty object store
+                openreq.onupgradeneeded = () => {
+                    openreq.result.createObjectStore(storeName);
+                };
+            });
+        }
+        _withIDBStore(type, callback) {
+            return this._dbp.then(db => new Promise((resolve, reject) => {
+                const transaction = db.transaction(this.storeName, type);
+                transaction.oncomplete = () => resolve();
+                transaction.onabort = transaction.onerror = () => reject(transaction.error);
+                callback(transaction.objectStore(this.storeName));
+            }));
+        }
+    }
+    let store;
+    function getDefaultStore() {
+        if (!store)
+            store = new Store();
+        return store;
+    }
+    function get(key, store = getDefaultStore()) {
+        let req;
+        return store._withIDBStore('readonly', store => {
+            req = store.get(key);
+        }).then(() => req.result);
+    }
+    function set(key, value, store = getDefaultStore()) {
+        return store._withIDBStore('readwrite', store => {
+            store.put(value, key);
+        });
+    }
+    function del(key, store = getDefaultStore()) {
+        return store._withIDBStore('readwrite', store => {
+            store.delete(key);
+        });
+    }
+    function clear(store = getDefaultStore()) {
+        return store._withIDBStore('readwrite', store => {
+            store.clear();
+        });
+    }
+    function keys(store = getDefaultStore()) {
+        const keys = [];
+        return store._withIDBStore('readonly', store => {
+            // This would be store.getAllKeys(), but it isn't supported by Edge or Safari.
+            // And openKeyCursor isn't supported by Safari.
+            (store.openKeyCursor || store.openCursor).call(store).onsuccess = function () {
+                if (!this.result)
+                    return;
+                keys.push(this.result.key);
+                this.result.continue();
+            };
+        }).then(() => keys);
+    }
+    
+    exports.Store = Store;
+    exports.get = get;
+    exports.set = set;
+    exports.del = del;
+    exports.clear = clear;
+    exports.keys = keys;
+    
+    return exports;
+    
+    }({}));
diff --git a/addons/website_event_track_online/static/src/js/event_track_reminder.js b/addons/website_event_track_online/static/src/js/event_track_reminder.js
new file mode 100644
index 00000000000..a4d86dd9452
--- /dev/null
+++ b/addons/website_event_track_online/static/src/js/event_track_reminder.js
@@ -0,0 +1,88 @@
+odoo.define('website_event_track.website_event_track_reminder', function (require) {
+'use strict';
+
+var core = require('web.core');
+var _t = core._t;
+var utils = require('web.utils');
+var publicWidget = require('web.public.widget');
+
+publicWidget.registry.websiteEventTrackReminder = publicWidget.Widget.extend({
+    selector: '.o_wetrack_js_reminder',
+    events: {
+        'click': '_onReminderToggleClick',
+    },
+
+    /**
+     * @override
+     */
+    init: function () {
+        this._super.apply(this, arguments);
+        this._onReminderToggleClick = _.debounce(this._onReminderToggleClick, 500, true);
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //-------------------------------------------------------------------------
+
+    /**
+     * @private
+     * @param {Event} ev
+     */
+    _onReminderToggleClick: function (ev) {
+        ev.stopPropagation();
+        ev.preventDefault();
+        var self = this;
+        var $trackLink = $(ev.currentTarget).find('i');
+
+        if (this.reminderOn === undefined) {
+            this.reminderOn = $trackLink.data('reminderOn');
+        }
+
+        var reminderOnValue = !this.reminderOn;
+
+        this._rpc({
+            route: '/event/track/toggle_reminder',
+            params: {
+                track_id: $trackLink.data('trackId'),
+                set_reminder_on: reminderOnValue,
+            },
+        }).then(function (result) {
+            if (result.error && result.error === 'ignored') {
+                self.displayNotification({
+                    type: 'info',
+                    title: _t('Error'),
+                    message: _.str.sprintf(_t('Talk already in your Favorites')),
+                });
+            } else {
+                self.reminderOn = reminderOnValue;
+                var reminderText = self.reminderOn ? _t('Reminder On') : _t('Set Reminder');
+                self.$('.o_wetrack_js_reminder_text').text(reminderText);
+                self._updateDisplay();
+                var message = self.reminderOn ? _t('Talk added to your Favorites') : _t('Talk removed from your Favorites');
+                self.displayNotification({
+                    type: 'info',
+                    title: message
+                });
+            }
+            if (result.visitor_uuid) {
+                utils.set_cookie('visitor_uuid', result.visitor_uuid);
+            }
+        });
+    },
+
+    _updateDisplay: function () {
+        var $trackLink = this.$el.find('i');
+        if (this.reminderOn) {
+            $trackLink.addClass('fa-bell').removeClass('fa-bell-o');
+            $trackLink.attr('title', _t('Reminder On'));
+        } else {
+            $trackLink.addClass('fa-bell-o').removeClass('fa-bell');
+            $trackLink.attr('title', _t('Set Reminder'));
+        }
+    },
+
+});
+
+return publicWidget.registry.websiteEventTrackReminder;
+
+});
diff --git a/addons/website_event_track_online/static/src/js/service_worker.js b/addons/website_event_track_online/static/src/js/service_worker.js
new file mode 100644
index 00000000000..21b64b0c8a1
--- /dev/null
+++ b/addons/website_event_track_online/static/src/js/service_worker.js
@@ -0,0 +1,228 @@
+importScripts("/website_event_track_online/static/lib/idb-keyval/idb-keyval.js");
+
+const PREFIX = "odoo-event";
+const SYNCABLE_ROUTES = ["/event/track/toggle_reminder"];
+const CACHABLE_ROUTES = ["/web/webclient/version_info"];
+
+const { Store, set, get, del } = idbKeyval;
+const pendingRequestsQueueName = `${PREFIX}-pending-requests`;
+const cacheName = `${PREFIX}-cache`;
+const syncStore = new Store(`${PREFIX}-sync-db`, `${PREFIX}-sync-store`);
+const cacheStore = new Store(`${PREFIX}-cache-db`, `${PREFIX}-cache-store`);
+
+/**
+ *
+ * @param {string} url
+ * @returns {string}
+ */
+const urlPathname = (url) => new URL(url).pathname;
+
+/**
+ *
+ * @param {Array} whitelist
+ * @returns {Function}
+ */
+const canHandleRoutes = (whitelist) => (url) => whitelist.includes(urlPathname(url));
+
+/**
+ *
+ * @param {Request} request
+ * @returns {boolean}
+ */
+const isGET = (request) => request.method === "GET";
+
+/**
+ *
+ * @returns {Function}
+ */
+const isSyncableURL = canHandleRoutes(SYNCABLE_ROUTES);
+
+/**
+ *
+ * @returns {Function}
+ */
+const isCachableURL = canHandleRoutes(CACHABLE_ROUTES);
+
+/**
+ *
+ * @param {Request} req
+ * @returns {Promise<Object>}
+ */
+const serializeRequest = async (req) => ({
+    url: req.url,
+    method: req.method,
+    headers: Object.fromEntries(req.headers.entries()),
+    body: await req.text(),
+    mode: req.mode,
+    credentials: req.credentials,
+    cache: req.cache,
+    redirect: req.redirect,
+    referrer: req.referrer,
+    integrity: req.integrity,
+});
+
+/**
+ *
+ * @param {Object} requestData
+ * @returns {Request}
+ */
+const deserializeRequest = (requestData) => {
+    const { url } = requestData;
+    delete requestData.url;
+    return new Request(url, requestData);
+};
+
+/**
+ *
+ * @param {Response} res
+ * @returns {Promise<Object>}
+ */
+const serializeResponse = async (res) => ({
+    body: await res.text(),
+    status: res.status,
+    statusText: res.statusText,
+    headers: Object.fromEntries(res.headers.entries()),
+});
+
+/**
+ *
+ * @param {Object} responseData
+ * @returns {Response}
+ */
+const deserializeResponse = (responseData) => {
+    const { body } = responseData;
+    delete responseData.body;
+    return new Response(body, responseData);
+};
+
+/**
+ *
+ * @param {Object} serializedRequest
+ * @returns {string}
+ */
+const buildCacheKey = ({ url, body: { method, params } }) =>
+    JSON.stringify({
+        url,
+        method,
+        params,
+    });
+
+/**
+ *
+ * @returns {int}
+ */
+const uniqueRequestId = () => Math.floor(Math.random() * 1000 * 1000 * 1000);
+
+/**
+ *
+ * @returns {Response}
+ */
+const buildEmptyResponse = () => new Response(JSON.stringify({ jsonrpc: "2.0", id: uniqueRequestId(), result: {} }));
+
+/**
+ *
+ * @param {Request} request
+ * @param {Response} response
+ * @returns {Promise}
+ */
+const cacheRequest = async (request, response) => {
+    if (isGET(request)) {
+        const cache = await caches.open(cacheName);
+        await cache.put(request, response.clone());
+    } else if (isCachableURL(request.url)) {
+        const serializedResponse = await serializeResponse(response.clone());
+        await set(buildCacheKey(serializedRequest), serializedResponse, cacheStore);
+    }
+};
+
+/**
+ *
+ * @param {Request} request
+ * @returns {boolean}
+ */
+const isCachableRequest = (request) => isGET(request) || isCachableURL(request.url);
+
+/**
+ *
+ * @param {Request} request
+ * @returns {Promise<Response|null>}
+ */
+const matchCache = async (request) => {
+    if (isGET(request)) {
+        const cache = await caches.open(cacheName);
+        return await cache.match(request);
+    }
+    if (isCachableURL(request.url)) {
+        const serializedRequest = await serializeRequest(requestCopy);
+        const cachedResponse = await get(buildCacheKey(serializedRequest), cacheStore);
+        if (cachedResponse) {
+            return deserializeResponse(cachedResponse);
+        }
+    }
+    return null;
+};
+
+/**
+ *
+ * @param {FetchEvent} param0
+ * @returns {Promise<Response>}
+ */
+const processFetchEvent = async ({ request }) => {
+    const requestCopy = request.clone();
+    let response;
+    try {
+        response = await fetch(request);
+        await cacheRequest(request, response);
+    } catch (requestError) {
+        if (isCachableRequest(requestCopy)) {
+            response = await matchCache(requestCopy);
+        } else if (isSyncableURL(requestCopy.url)) {
+            const pendingRequests = (await get(pendingRequestsQueueName, syncStore)) || [];
+            const serializedRequest = await serializeRequest(requestCopy);
+            await set(pendingRequestsQueueName, [...pendingRequests, serializedRequest], syncStore);
+            if (self.registration.sync) {
+                await self.registration.sync.register(pendingRequestsQueueName).catch((err) => {
+                    console.warn("Cannot use BackgroundSync", err);
+                    throw requestError;
+                });
+            }
+            return buildEmptyResponse();
+        } else {
+            console.warn(`Offline ${requestCopy.method} request currently not supported`, requestCopy);
+        }
+
+        if (!response) {
+            throw requestError;
+        }
+    }
+    return response;
+};
+
+/**
+ *
+ * @returns {Promise}
+ */
+const processPendingRequests = async () => {
+    const pendingRequests = (await get(pendingRequestsQueueName, syncStore)) || [];
+    if (!pendingRequests.length) {
+        console.info("Nothing to sync!");
+        return;
+    }
+    let pendingRequest;
+    while ((pendingRequest = pendingRequests.shift())) {
+        const request = deserializeRequest(pendingRequest);
+        await fetch(request);
+        await set(pendingRequestsQueueName, pendingRequests, syncStore);
+    }
+};
+
+self.addEventListener("fetch", (event) => {
+    event.respondWith(processFetchEvent(event));
+});
+
+self.addEventListener("sync", (event) => {
+    console.info(`Syncing pending requests...`);
+    if (event.tag === pendingRequestsQueueName) {
+        event.waitUntil(processPendingRequests());
+    }
+});
diff --git a/addons/website_event_track_online/static/src/js/website_event_customize_options.js b/addons/website_event_track_online/static/src/js/website_event_customize_options.js
new file mode 100644
index 00000000000..d86ef9db4b2
--- /dev/null
+++ b/addons/website_event_track_online/static/src/js/website_event_customize_options.js
@@ -0,0 +1,13 @@
+odoo.define('website_event_track_online.set_customize_options', function (require) {
+"use strict";
+
+var EventSpecificOptions = require('website_event.set_customize_options').EventSpecificOptions;
+
+EventSpecificOptions.include({
+    xmlDependencies: (EventSpecificOptions.prototype.xmlDependencies || [])
+        .concat([
+            '/website_event_track_online/static/src/xml/website_event_customize_options.xml',
+        ]),
+});
+
+});
diff --git a/addons/website_event_track_online/static/src/js/website_event_pwa_widget.js b/addons/website_event_track_online/static/src/js/website_event_pwa_widget.js
new file mode 100644
index 00000000000..f8fffb3f9b1
--- /dev/null
+++ b/addons/website_event_track_online/static/src/js/website_event_pwa_widget.js
@@ -0,0 +1,132 @@
+odoo.define("website_event_track_online.website_event_pwa_widget", function (require) {
+    "use strict";
+
+    var config = require("web.config");
+    var publicWidget = require("web.public.widget");
+
+    var PWAInstallBanner = publicWidget.Widget.extend({
+        xmlDependencies: ["/website_event_track_online/static/src/xml/website_event_pwa.xml"],
+        template: "pwa_install_banner",
+        events: {
+            "click .o_btn_install": "_onClickInstall",
+        },
+
+        /**
+         * @private
+         */
+        _onClickInstall: function () {
+            this.trigger_up("prompt_install");
+        },
+    });
+
+    publicWidget.registry.WebsiteEventPWAWidget = publicWidget.Widget.extend({
+        selector: "#wrapwrap.event",
+        custom_events: {
+            prompt_install: "_onPromptInstall",
+        },
+
+        /**
+         *
+         * @override
+         */
+        init: function () {
+            this._super.apply(this, arguments);
+            this.beforeInstallPromptHandler = this._onBeforeInstallPrompt.bind(this);
+        },
+
+        /**
+         *
+         * @override
+         */
+        start: function () {
+            var superProm = this._super.apply(this, arguments);
+            window.addEventListener("beforeinstallprompt", this.beforeInstallPromptHandler);
+            return superProm.then(this._registerServiceWorker);
+        },
+
+        /**
+         *
+         * @override
+         */
+        destroy: function () {
+            window.removeEventListener("beforeinstallprompt", this.beforeInstallPromptHandler);
+            this._super.apply(this, arguments);
+        },
+
+        //--------------------------------------------------------------------------
+        // Private
+        //--------------------------------------------------------------------------
+
+        /**
+         * @private
+         */
+        _hideInstallBanner: function () {
+            this.installBanner ? this.installBanner.destroy() : undefined;
+        },
+
+        /**
+         *
+         * @private
+         */
+        _registerServiceWorker: function () {
+            if (!("serviceWorker" in navigator)) {
+                return;
+            }
+            navigator.serviceWorker
+                .register("/event/service-worker.js", { scope: "/event" })
+                .then((registration) => {
+                    console.info("Registration successful, scope is:", registration.scope);
+                })
+                .catch((error) => {
+                    console.error("Service worker registration failed, error:", error);
+                });
+        },
+
+        /**
+         * @private
+         */
+        _showInstallBanner: function () {
+            this.installBanner = new PWAInstallBanner(this);
+            this.installBanner.appendTo(this.$el);
+        },
+
+        //--------------------------------------------------------------------------
+        // Handlers
+        //--------------------------------------------------------------------------
+
+        /**
+         * @private
+         * @param ev {Event}
+         */
+        _onBeforeInstallPrompt: function (ev) {
+            if (!config.device.isMobile) {
+                return;
+            }
+            ev.preventDefault();
+            this.deferredPrompt = ev;
+            this._showInstallBanner();
+        },
+
+        /**
+         * @private
+         * @param ev {Event}
+         */
+        _onPromptInstall: function (ev) {
+            ev.stopPropagation();
+            this.deferredPrompt.prompt();
+            this._hideInstallBanner();
+            this.deferredPrompt.userChoice.then((choiceResult) => {
+                if (choiceResult.outcome === "accepted") {
+                    console.log("User accepted the install prompt");
+                } else {
+                    console.log("User dismissed the install prompt");
+                }
+            });
+        },
+    });
+
+    return {
+        PWAInstallBanner: PWAInstallBanner,
+        WebsiteEventPWAWidget: publicWidget.registry.WebsiteEventPWAWidget,
+    };
+});
diff --git a/addons/website_event_track_online/static/src/scss/event_track_templates.scss b/addons/website_event_track_online/static/src/scss/event_track_templates.scss
new file mode 100644
index 00000000000..1772d02ea91
--- /dev/null
+++ b/addons/website_event_track_online/static/src/scss/event_track_templates.scss
@@ -0,0 +1,194 @@
+/*
+ * EVENT TOOL: REMINDER WIDGET
+ */
+.o_wevent_event .o_wetrack_js_reminder {
+    width: fit-content;
+    height: fit-content;
+    cursor: pointer;
+    background: grey;
+
+    i {
+        &.fa-bell {
+            color: gold;
+        }
+        &.fa-bell-o {
+            color: white
+        }
+    }
+
+    // Icon only
+    &.o_wetrack_reminder_light {
+        background: transparent;
+        padding: 0;
+        i {
+            &.inactive_color_dark {
+                color: grey;
+            }
+        }
+        &:not(.o_wetrack_reminder_small) {
+            i {
+                font-size: 1.5em;
+            }
+        }
+    }
+
+    // Text included
+    &:not(.o_wetrack_reminder_light) {
+        &.o_wetrack_reminder_small {
+            padding: 0.25rem 0.50rem;
+            span {
+                min-width: 70px;
+            }
+        }
+    }
+}
+
+/*
+ * AGENDA
+ */
+.o_we_online_agenda {
+    overflow-x: hidden;
+    @media (max-width: map-get($grid-breakpoints, 'md')) {
+        overflow-x: scroll;
+    }
+
+    table {
+        border-collapse: separate;
+        border-spacing: 0em 0em;
+        tr {
+            height: 15px;
+            line-height: 1em;
+            &.active {
+                td.active {
+                    padding: 0em 0.5em;
+                    font-size: smaller;
+                    border-top: 1px solid lightgrey;
+                }
+            }
+        }
+        th.active, td:not(.active) {
+            background-color: #d3d3d36e;
+        }
+        th.position-sticky {
+            left: 0;
+        }
+        td {
+            height: 0px;
+            border: 0px;
+            &.active {
+                position: sticky;
+                left: 0;
+                min-width: 100px;
+                background-color: white;
+            }
+            div.o_we_agenda_card_content {
+                height: 100%;
+                span {
+                    cursor: pointer;
+                }
+            }
+            .badge {
+                height: fit-content;
+            }
+            &.invisible {
+                visibility: visible !important;
+                opacity: 0.3;
+            }
+            &.o_we_agenda_time_slot_main {
+                border-top: 1px solid lightgrey;
+            }
+            &.o_we_agenda_time_slot_half {
+                border-top: 1px dashed lightgrey;
+            }
+            &.event_color_0 {
+                background-color: lightgrey;
+            }
+            &.event_color_1 {
+                background-color: rgba(240, 96, 80, 0.2);
+            }
+            &.event_color_2 {
+                background-color: rgba(244, 164, 96, 0.2);
+            }
+            &.event_color_3 {
+                background-color: rgba(247, 205, 31, 0.2);
+            }
+            &.event_color_4 {
+                background-color: rgba(108,193,237,0.2);
+            }
+            &.event_color_5 {
+                background-color: rgba(129,73,104,0.2);
+            }
+            &.event_color_6 {
+                background-color: rgba(235,126,127,0.2);
+            }
+            &.event_color_7 {
+                background-color: rgba(44,131,151,0.2);
+            }
+            &.event_color_8 {
+                background-color: rgba(71,85,119,0.2);;
+            }
+            &.event_color_9 {
+                background-color: rgba(214,20,95,0.2);
+            }
+            &.event_color_10 {
+                background-color: rgba(48,195,129,0.2);
+            }
+            &.event_color_11 {
+                background-color: rgba(147,101,184,0.2);
+            }
+        }
+    }
+}
+
+/*
+ * EVENT TOOL: SPONSOR WIDGET
+ */
+.o_wevent_event .o_wevent_sponsor_card {
+    position: relative;
+    width: 100px;
+    height: 100px;
+    border: 1px solid $gray-200;
+    background-color: $white;
+    margin: 0 -1px -1px 0;
+
+    .ribbon-wrapper {
+        width: 50px;
+        height: 50px;
+    }
+
+    .ribbon {
+        font: bold 10px Sans-Serif;
+        padding: 2px 0;
+        top: 10px;
+        width: 70px;
+        background-image: none; // not needed if colors for ribbons (Gold,Silver,Bronze) is removed in website_event_track.css
+
+        &.ribbon_Gold {
+            background-color: #e3aa24;
+            color:$white;
+        }
+
+        &.ribbon_Silver {
+            background-color: #adb5bd;
+            color: $white;
+        }
+
+        &.ribbon_Bronze {
+            background-color: #c7632a;
+            color: $white;
+        }
+    }
+
+    &:before {
+        content: "";
+        display: block;
+        @include o-position-absolute(0,0,0,0);
+        background-color: $black;
+        opacity: 0;
+        transition: opacity .3s;
+    }
+
+    &:hover:before {
+        opacity:.1;
+    }
+}
diff --git a/addons/website_event_track_online/static/src/scss/pwa_frontend.scss b/addons/website_event_track_online/static/src/scss/pwa_frontend.scss
new file mode 100644
index 00000000000..f7ce1f5b0af
--- /dev/null
+++ b/addons/website_event_track_online/static/src/scss/pwa_frontend.scss
@@ -0,0 +1,29 @@
+@media all and (display-mode: standalone) {
+    #wrapwrap.event {
+        #top,
+        #bottom {
+            display: none;
+        }
+    }
+}
+
+#wrapwrap.event {
+    .o_pwa_install_banner {
+        position: fixed;
+        display: flex;
+        bottom: 0;
+        right: 0;
+        left: 0;
+        margin: 0;
+        justify-content: space-between;
+        align-items: center;
+        background-color: rgba(255, 255, 255, 1);
+        border-top: 1px solid $gray-200;
+        box-shadow: 0 -0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+        font-size: 1rem;
+
+        .o_btn_install {
+            margin-left: auto;
+        }
+    }
+}
diff --git a/addons/website_event_track_online/static/src/xml/website_event_customize_options.xml b/addons/website_event_track_online/static/src/xml/website_event_customize_options.xml
new file mode 100644
index 00000000000..22d5e2fd836
--- /dev/null
+++ b/addons/website_event_track_online/static/src/xml/website_event_customize_options.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+
+    <t t-name="website_event_track.customize_options" t-extend="website_event.customize_options">
+        <t t-jquery="a[name='display-showcase-talks']" t-operation="replace">
+        </t>
+        <t t-jquery="a[name='allow-talk-proposal']" t-operation="replace">
+        </t>
+    </t>
+
+</templates>
diff --git a/addons/website_event_track_online/static/src/xml/website_event_pwa.xml b/addons/website_event_track_online/static/src/xml/website_event_pwa.xml
new file mode 100644
index 00000000000..41c75ab3f34
--- /dev/null
+++ b/addons/website_event_track_online/static/src/xml/website_event_pwa.xml
@@ -0,0 +1,10 @@
+<templates>
+
+    <t t-name="pwa_install_banner">
+        <div class="alert alert-default o_pwa_install_banner">
+            <strong>Install Application</strong>
+            <button class="btn btn-primary o_btn_install">Install</button>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/website_event_track_online/tests/__init__.py b/addons/website_event_track_online/tests/__init__.py
new file mode 100644
index 00000000000..511e649c9e2
--- /dev/null
+++ b/addons/website_event_track_online/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import common
diff --git a/addons/website_event_track_online/tests/common.py b/addons/website_event_track_online/tests/common.py
new file mode 100644
index 00000000000..f3d5e52f53b
--- /dev/null
+++ b/addons/website_event_track_online/tests/common.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.website_event_online.tests.common import TestEventOnlineCommon
+
+
+class TestEventTrackOnlineCommon(TestEventOnlineCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestEventTrackOnlineCommon, cls).setUpClass()
+
+        cls.sponsor_type_0 = cls.env['event.sponsor.type'].create({
+            'name': 'GigaTop',
+            'sequence': 1,
+        })
+        cls.sponsor_0_partner = cls.env['res.partner'].create({
+            'name': 'EventSponsor',
+            'country_id': cls.env.ref('base.be').id,
+            'email': 'event.sponsor@example.com',
+            'phone': '04856112233',
+        })
+
+        cls.sponsor_0 = cls.env['event.sponsor'].create({
+            'partner_id': cls.sponsor_0_partner.id,
+            'event_id': cls.event_0.id,
+            'sponsor_type_id': cls.sponsor_type_0.id,
+        })
diff --git a/addons/website_event_track_online/views/assets.xml b/addons/website_event_track_online/views/assets.xml
new file mode 100644
index 00000000000..3590b1c8b56
--- /dev/null
+++ b/addons/website_event_track_online/views/assets.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Track Online Assets Frontend">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website_event_track_online/static/src/scss/event_track_templates.scss"/>
+        <link rel="stylesheet" type="text/scss" href="/website_event_track_online/static/src/scss/pwa_frontend.scss"/>
+    </xpath>
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_event_track_online/static/src/js/event_track_reminder.js"></script>
+        <script type="text/javascript" src="/website_event_track_online/static/src/js/website_event_customize_options.js"></script>
+        <script type="text/javascript" src="/website_event_track_online/static/lib/idb-keyval/idb-keyval.js"/>
+        <script type="text/javascript" src="/website_event_track_online/static/src/js/website_event_pwa_widget.js"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/event_event_views.xml b/addons/website_event_track_online/views/event_event_views.xml
new file mode 100644
index 00000000000..c1aa910cc07
--- /dev/null
+++ b/addons/website_event_track_online/views/event_event_views.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <record id="event_event_view_form" model="ir.ui.view">
+        <field name="name">event.event.view.from.inherit.track.online</field>
+        <field name="model">event.event</field>
+        <field name="inherit_id" ref="website_event_online.event_event_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='website_menu']" position="after">
+                <label for="website_track" string="Showcase Tracks"/>
+                <field name="website_track"/>
+                <label for="website_track_proposal" string="Allow Track Proposals"/>
+                <field name="website_track_proposal"/>
+            </xpath>
+            <xpath expr="//div[@name='event_menu_configuration']" position='inside'>
+                <label for="community_menu" string="Community"/>
+                <field name="community_menu"/>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
+
+
diff --git a/addons/website_event_track_online/views/event_menus.xml b/addons/website_event_track_online/views/event_menus.xml
new file mode 100644
index 00000000000..f8a69e4d6ef
--- /dev/null
+++ b/addons/website_event_track_online/views/event_menus.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <menuitem id="event_track_tag_category_menu"
+        name="Track Tag Categories"
+        action="event_track_tag_category_action"
+        parent="event.menu_event_configuration"
+        groups="base.group_no_one"
+        sequence="33"/>
+
+    <menuitem id="event_track_visitor_menu"
+        name="Track Visitors"
+        sequence="38"
+        action="event_track_visitor_action"
+        parent="event.menu_event_configuration"
+        groups="base.group_no_one"/>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/views/event_sponsor_type_views.xml b/addons/website_event_track_online/views/event_sponsor_type_views.xml
new file mode 100644
index 00000000000..31e986fd2f9
--- /dev/null
+++ b/addons/website_event_track_online/views/event_sponsor_type_views.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="event_sponsor_type_view_tree" model="ir.ui.view">
+        <field name="name">event.sponsor.type.view.tree.inherit.online</field>
+        <field name="model">event.sponsor.type</field>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_type_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="display_ribbon_style"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_sponsor_type_view_form" model="ir.ui.view">
+        <field name="name">event.sponsor.type.view.form.inherit.online</field>
+        <field name="model">event.sponsor.type</field>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_type_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="display_ribbon_style"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_event_track_online/views/event_sponsor_views.xml b/addons/website_event_track_online/views/event_sponsor_views.xml
new file mode 100644
index 00000000000..9fd79468f71
--- /dev/null
+++ b/addons/website_event_track_online/views/event_sponsor_views.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="event_sponsor_view_search" model="ir.ui.view">
+        <field name="name">event.sponsor.view.search.inherit.online</field>
+        <field name="model">event.sponsor</field>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_view_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="name"/>
+                <field name="email"/>
+                <field name="phone"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_sponsor_view_tree" model="ir.ui.view">
+        <field name="name">event.sponsor.view.tree.inherit.online</field>
+        <field name="model">event.sponsor</field>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="name"/>
+                <field name="email"/>
+                <field name="phone"/>
+                <field name="mobile"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_sponsor_view_form" model="ir.ui.view">
+        <field name="name">event.sponsor.view.form.inherit.online</field>
+        <field name="model">event.sponsor</field>
+        <field name="inherit_id" ref="website_event_track.event_sponsor_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='image_128']" position="replace">
+                <field name="image_512" widget="image" class="oe_avatar"/>
+            </xpath>
+            <xpath expr="//h1//field[@name='partner_id']" position="replace">
+                <div class="oe_title">
+                    <label for="name" class="oe_edit_only" string="Sponsor Name"/>
+                    <h1><field name="name" placeholder="e.g. : OpenWood Decoration"/></h1>
+                </div>
+            </xpath>
+            <xpath expr="//field[@name='event_id']" position="after">
+                <field name="partner_id" string="Partner"/>
+            </xpath>
+            <xpath expr="//field[@name='partner_email']" position="replace">
+                <field name="email" widget="email" string="Email"
+                    placeholder="e.g. : open.wood.decoration@example.com"/>
+            </xpath>
+            <xpath expr="//field[@name='url']" position="attributes">
+                <attribute name="placeholder">e.g. : https://www.odoo.com</attribute>
+            </xpath>
+            <xpath expr="//field[@name='partner_phone']" position="replace">
+                <field name="phone" widget="phone" string="Phone" options="{'enable_sms': True}"/>
+            </xpath>
+            <xpath expr="//field[@name='partner_mobile']" position="replace">
+                <field name="mobile" widget="phone" string="Mobile" options="{'enable_sms': True}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_event_track_online/views/event_templates_registration.xml b/addons/website_event_track_online/views/event_templates_registration.xml
new file mode 100644
index 00000000000..2be03556d1e
--- /dev/null
+++ b/addons/website_event_track_online/views/event_templates_registration.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Add a shortcut to wishlist / talks after registration -->
+<template id="registration_complete" inherit_id="website_event.registration_complete">
+    <xpath expr="//div[hasclass('row')][last()]" position="after">
+        <div t-if="event.website_track" class="row mt-5">
+            <div class="col-12">
+                <h3>Book your seats to the best talks</h3>
+                <p>Get prepared and
+                    <a t-att-href="'/event/%s/track' % (slug(event))">register to your favorites talks now.</a>
+                </p>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+<template id="layout" inherit_id="website_event.layout">
+    <xpath expr='//t[@t-call="website.layout"]' position="inside">
+        <t t-set="pageName" t-value="'event'"/>
+        <t t-set="head">
+            <t t-raw="head"/>
+            <t t-call="website_event_track_online.pwa_manifest"/>
+        </t>
+    </xpath>
+</template>
+
+<template id="index" inherit_id="website_event.index">
+    <xpath expr='//t[@t-call="website.layout"]' position="inside">
+        <t t-set="pageName" t-value="'event'"/>
+        <t t-set="head">
+            <t t-raw="head"/>
+            <t t-call="website_event_track_online.pwa_manifest"/>
+        </t>
+    </xpath>
+</template>
+
+<template id="pwa_manifest">
+    <link rel="manifest" href="/event/manifest.webmanifest"/>
+    <link rel="apple-touch-icon" t-att-href="website.image_url(website, 'app_icon', size='192x192')"/>
+    <meta name="theme-color" content="#875A7B"/>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/event_track_stage_views.xml b/addons/website_event_track_online/views/event_track_stage_views.xml
new file mode 100644
index 00000000000..9840a03cc8d
--- /dev/null
+++ b/addons/website_event_track_online/views/event_track_stage_views.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <record id="event_track_stage_view_form" model="ir.ui.view">
+        <field name="name">event.track.stage.view.form.inherit.online</field>
+        <field name="model">event.track.stage</field>
+        <field name="inherit_id" ref="website_event_track.event_track_stage_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='is_done']" position="before">
+                <field name="is_accepted"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_track_stage_view_tree" model="ir.ui.view">
+        <field name="name">event.track.stage.view.tree.inherit.online</field>
+        <field name="model">event.track.stage</field>
+        <field name="inherit_id" ref="website_event_track.event_track_stage_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="is_accepted"/>
+                <field name="is_done"/>
+                <field name="is_cancel"/>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/views/event_track_tag_views.xml b/addons/website_event_track_online/views/event_track_tag_views.xml
new file mode 100644
index 00000000000..a4dd0cbedba
--- /dev/null
+++ b/addons/website_event_track_online/views/event_track_tag_views.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<odoo><data>
+    <record id="event_track_tag_category_view_form" model="ir.ui.view">
+        <field name="name">event.track.tag.category.view.form</field>
+        <field name="model">event.track.tag.category</field>
+        <field name="arch" type="xml">
+            <form string="Track Tag Category">
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                        <field name="tag_ids" context="{'default_category_id': active_id}">
+                            <tree string="Tags" editable="bottom">
+                                <field name="sequence" widget="handle"/>
+                                <field name="name"/>
+                                <field name="color" widget="color_picker"/>
+                            </tree>
+                        </field>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="event_track_tag_category_view_list" model="ir.ui.view">
+        <field name="name">event.track.tag.category.view.list</field>
+        <field name="model">event.track.tag.category</field>
+        <field name="arch" type="xml">
+            <tree string="Track Tags Category">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>
+                <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="event_track_tag_category_action" model="ir.actions.act_window">
+        <field name="name">Track Tag Categories</field>
+        <field name="res_model">event.track.tag.category</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="event_track_tag_view_form" model="ir.ui.view">
+        <field name="name">event.track.tag.view.form.inherit.online</field>
+        <field name="model">event.track.tag</field>
+        <field name="inherit_id" ref="website_event_track.view_event_track_tag_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="color" widget="color_picker"/>
+                <field name="category_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_track_tag_view_list" model="ir.ui.view">
+        <field name="name">event.track.tag.view.list.inherit.online</field>
+        <field name="model">event.track.tag</field>
+        <field name="inherit_id" ref="website_event_track.view_event_track_tag_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="before">
+                <field name="sequence" widget="handle"/>
+            </xpath>
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="color" widget="color_picker"/>
+                <field name="category_id"/>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/views/event_track_templates.xml b/addons/website_event_track_online/views/event_track_templates.xml
new file mode 100644
index 00000000000..08f95c92af3
--- /dev/null
+++ b/addons/website_event_track_online/views/event_track_templates.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Set original template for tracks / track as tracking visitors -->
+<record model="ir.ui.view" id="website_event_track.tracks">
+    <field name="track" eval="True"/>
+</record>
+<record model="ir.ui.view" id="website_event_track.track_view">
+    <field name="track" eval="True"/>
+</record>
+
+<!-- Add wishlist button on tracks / track templates -->
+<template id="tracks_wishlist"
+    name="Wishlist on Tracks"
+    inherit_id="website_event_track.tracks"
+    customize_show="True">
+    <xpath expr="//h3" position="replace">
+        <h3 class="mt0 mb0 d-flex">
+            <a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }" class="text-secondary"><span t-field="track.name"> </span></a>
+            <small t-if="not track.website_published" class="badge badge-danger">unpublished</small>
+            <t t-call="website_event_track_online.track_widget_reminder"/>
+        </h3>
+    </xpath>
+</template>
+
+<template id="track_view_wishlist"
+    name="Wishlist on Track"
+    inherit_id="website_event_track.track_view"
+    customize_show="True">
+    <xpath expr="//h1" position="replace">
+        <div class="d-flex">
+            <h1 t-field="track.name"/>
+            <div class="ml-2 pt-1">
+                <t t-call="website_event_track_online.track_widget_reminder"/>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+<!-- Pimp agenda based on accepted / published -->
+<template id="agenda"
+    name="Track Online: Agenda"
+    inherit_id="website_event_track.agenda">
+    <xpath expr="//t[@name='track_agenda_track_cell']" position="replace">
+        <t t-if="track" name="track_agenda_track_cell">
+            <t t-if="user_event_manager or track.is_published">
+                <a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }">
+                    <span t-esc="track.name"/>
+                </a>
+            </t>
+            <t t-else="">
+                <span t-esc="track.name"/>
+            </t>
+            <div class="d-flex text-muted">
+                <small t-esc="track.partner_name or track.partner_id.name"/>
+                <span t-if="user_event_manager and not track.website_published" class=" ml-auto badge badge-danger">unpublished</span>
+            </div>
+        </t>
+    </xpath>
+</template>
+
+<!-- Pimp sponsor view -->
+<template id="event_sponsor"
+    name="Track Online: Sponsors"
+    inherit_id="website_event_track.event_sponsor">
+    <xpath expr="//div[@t-if='event.sponsor_ids']" position="replace">
+        <div class="container mt32 mb16 d-print-none" t-if="event.sponsor_ids">
+            <div t-attf-class="d-flex flex-wrap mb-5 #{'' if (len(event.sponsor_ids) > 10) else 'justify-content-md-center'}">
+                <t t-foreach="event.sponsor_ids" t-as="sponsor">
+                    <t t-if="sponsor.url">
+                        <a class="o_wevent_sponsor_card" target="_blank" t-att-href="sponsor.url">
+                            <div class="h-100 shadow-sm p-2">
+                                <span t-field="sponsor.image_128"
+                                    t-options='{"widget": "image", "class": "img img-fluid"}'/>
+                                <div t-if="sponsor.sponsor_type_id.display_ribbon_style and sponsor.sponsor_type_id.display_ribbon_style != 'no_ribbon'" class="ribbon-wrapper">
+                                    <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.display_ribbon_style}"/>
+                                </div>
+                            </div>
+                        </a>
+                    </t>
+                    <t t-if="not sponsor.url">
+                        <div class="o_wevent_sponsor_card">
+                            <div class="h-100 shadow-sm p-2">
+                                <span t-field="sponsor.image_128"
+                                    t-options='{"widget": "image", "class": "img img-fluid"}'/>
+                                <div t-if="sponsor.sponsor_type_id.display_ribbon_style and sponsor.sponsor_type_id.display_ribbon_style != 'no_ribbon'" class="ribbon-wrapper">
+                                    <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.display_ribbon_style}"/>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </t>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/event_track_templates_agenda.xml b/addons/website_event_track_online/views/event_track_templates_agenda.xml
new file mode 100644
index 00000000000..b6159f55f23
--- /dev/null
+++ b/addons/website_event_track_online/views/event_track_templates_agenda.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Revamped agenda : Will need to replace agenda_online from website_event_track in master -->
+<template id="agenda_online" name="Track Online: Agenda">
+    <t t-call="website_event.layout">
+        <div class="o_wevent_online o_weagenda_index">
+            <!-- Options -->
+            <t t-set="option_track_wishlist" t-value="not event.is_done and request.website.viewref('website_event_track_online.agenda_topbar_wishlist').active"/>
+            <!-- Topbar -->
+            <t t-call="website_event_track_online.agenda_topbar"/>
+            <!-- Drag/Drop Area -->
+            <div class="oe_structure" id="oe_structure_website_event_track_agenda_1"/>
+            <!-- Content -->
+            <div class="container">
+                <div class="row mb-5">
+                    <t t-call="website_event_track_online.agenda_main"/>
+                </div>
+            </div>
+            <!-- Drag/Drop Area -->
+            <div class="oe_structure" id="oe_structure_website_event_track_agenda_2"/>
+        </div>
+    </t>
+</template>
+
+
+<!-- ============================================================ -->
+<!-- TOPBAR: BASE NAVIGATION -->
+<!-- ============================================================ -->
+
+<!-- Main topbar -->
+<template id="agenda_topbar" name="Agenda Tools">
+    <nav class="navbar navbar-light border-top shadow-sm d-print-none">
+        <div class="container">
+            <div class="d-flex flex-column flex-sm-row justify-content-between w-100">
+                <ul class="o_weagenda_topbar_filters o_wevent_index_topbar_filters nav">
+                </ul>
+                <div class="form-inline pl-sm-3 pr-0">
+                    <label class="invisible text-muted mr-2" id="search_summary"><span id="search_number" class="mr-1">0</span>Results</label>
+                    <input type="text" class="form-control" placeholder="Filter Tracks..." id="event_track_search"/>
+                </div>
+            </div>
+        </div>
+    </nav>
+</template>
+
+<!-- Option: Tracks display: optional wishlist -->
+<template id="agenda_topbar_wishlist"
+    inherit_id="website_event_track_online.agenda_topbar"
+    name="Allow Wishlists"
+    active="True"
+    customize_show="True">
+    <xpath expr="//ul[hasclass('o_weagenda_topbar_filters')]" position="inside">
+    </xpath>
+</template>
+
+<!-- ============================================================ -->
+<!-- CONTENT: MAIN TEMPLATES -->
+<!-- ============================================================ -->
+
+<!-- Agenda Main Display -->
+<template id="agenda_main" name="Tracks: Main Display">
+    <!-- No tracks -->
+    <div class="col-12" t-if="not tracks_by_days">
+        <div class="h2 mb-3">No track found.</div>
+        <div t-if="search_key" class="alert alert-info text-center">
+            <p class="m-0">We did not find any track matching your <strong t-esc="search_key"/> search.</p>
+        </div>
+        <div t-else="" class="alert alert-info text-center" groups="event.group_event_manager">
+            <p class="m-0">Schedule some tracks to get started !</p>
+        </div>
+    </div>
+
+    <section t-else="" class="col-12" t-foreach="days" t-as="day">
+        <!-- Day Title -->
+        <div class="o_page_hader d-flex justify-content-between align-items-center mt-3 mb-0 border-bottom border-dark">
+            <h3 class="d-flex">
+                <span class="mr-2" t-esc="day.strftime('%A')"/> <span t-esc="day.day"/>
+                <div class="ml-2 d-flex flex-column" style="line-height: 0.8; font-size: 0.5em;">
+                    <span class="pt-1 pb-1" t-esc="day.strftime('%B').upper()"/>
+                    <span t-esc="day.year"/>
+                </div>
+
+            </h3>
+            <small class="float-right text-muted"><t t-esc="tracks_by_days[day]"/> tracks</small>
+        </div>
+
+        <!-- Day Agenda -->
+        <div class="o_we_online_agenda">
+        <table id="table_search" class="table table-sm border-0">
+            <!--Header-->
+            <tr>
+                <th class="border-0 bg-white position-sticky"/>
+                <t t-foreach="locations" t-as="location">
+                    <th t-if="location" class="active text-center border-0">
+                        <span t-esc="location and location.name or 'Unknown'"/>
+                    </th>
+                </t>
+            </tr>
+
+            <!-- Time Slots -->
+            <t t-set="used_cells" t-value="[]"/>
+            <t t-foreach="time_slots[day]" t-as="time_slot">
+                <t t-set="is_round_hour" t-value="time_slot == time_slot.replace(minute=0)"/>
+                <t t-set="is_half_hour" t-value="time_slot == time_slot.replace(minute=30)"/>
+
+                <tr t-att-class="'%s' % ('active' if is_round_hour else '')">
+                    <td class="active">
+                        <b t-if="is_round_hour" t-esc="time_slots[day][time_slot]['formatted_time']"/>
+                    </td>
+
+                    <t t-foreach="locations" t-as="location">
+                        <t t-set="tracks" t-value="time_slots[day][time_slot].get(location, {})"/>
+                        <t t-if="tracks">
+                            <t t-foreach="tracks" t-as="track">
+                                <t t-if="track.location_id and track.location_id == location">
+                                    <td t-att-rowspan="tracks[track]['rowspan']"
+                                        t-attf-class="text-center event_color_#{track.color} #{track and 'event_track' or ''}">
+                                        <t t-call="website_event_track_online.agenda_main_track"/>
+                                    </td>
+                                </t>
+                                <t t-else="">
+                                    <td t-att-colspan="len(locations)-1"
+                                        t-att-rowspan="tracks[track]['rowspan']"
+                                        t-attf-class="text-center event_color_#{track.color} #{track and 'event_track' or ''}">
+                                        <t t-call="website_event_track_online.agenda_main_track"/>
+                                    </td>
+                                </t>
+                                <t t-set="used_cells" t-value="used_cells + tracks[track]['occupied_cells']"/>
+                            </t>
+                        </t>
+                        <t t-elif="location and (time_slot, location) not in used_cells">
+                            <td t-att-rowspan="1"
+                                t-att-class="'%s' % (
+                                    'o_we_agenda_time_slot_half' if is_half_hour else
+                                    'o_we_agenda_time_slot_main' if is_round_hour else
+                                    ''
+                                )"/>
+                        </t>
+                    </t>
+                </tr>
+            </t>
+        </table>
+        </div>
+    </section>
+</template>
+
+<template id="agenda_main_track" name="Track Agenda: Track">
+    <div class="d-flex flex-column h-100">
+        <div class="d-flex justify-content-between align-items-center">
+            <div class="text-muted">
+                <small t-if="track.partner_id"><i class="fa fa-user mr-2"/><t t-esc="track.partner_id.sudo().name"/></small>
+                <small t-if="not track.partner_id"><i class="fa fa-user mr-2"/><t t-esc="track.partner_name"/></small>
+            </div>
+            <div class="d-flex o_weagenda_track_badges">
+                <small t-if="not track.website_published and user_event_manager and track.stage_id.is_accepted"
+                       class="ml-1 badge badge-danger o_wevent_online_badge_unpublished">Unpublished</small>
+                <small t-if="not track.stage_id.is_accepted"
+                       class="ml-1 badge badge-danger o_wevent_online_badge_unpublished">Not Accepted</small>
+                <span t-if="option_track_wishlist">
+                    <t t-call="website_event_track_online.track_widget_reminder">
+                        <t t-set="reminder_light" t-value="True"/>
+                        <t t-set="reminder_small" t-value="True"/>
+                    </t>
+                </span>
+            </div>
+        </div>
+
+        <div class="o_we_agenda_card_content d-flex flex-column justify-content-center my-1">
+            <div t-att-class="'text-black' if track.website_published or user_event_manager else 'text-muted'"
+                 t-att-onclick="'window.location=\'/event/%s/track/%s\'' % (slug(event), slug(track))
+                    if track.website_published or user_event_manager else ''">
+                <span class="text-bold" t-esc="track.name"/>
+            </div>
+            <div class="d-flex justify-content-center flex-wrap">
+                <span t-foreach="track.tag_ids" t-as="tag"
+                      t-attf-class="mr-1 mt-1 badge #{'o_tag_color_'+str(tag.color)}" t-esc="tag.name"
+                      t-attf-onclick="
+                        var value = '#{tag.name}' ;
+                        var target = $('#event_track_search');
+                        if (target.val() == value) { target.val(''); } else { target.val(value); }
+                        target.trigger('input');
+                      "
+                />
+            </div>
+        </div>
+    </div>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/event_track_templates_reminder.xml b/addons/website_event_track_online/views/event_track_templates_reminder.xml
new file mode 100644
index 00000000000..2771cda1307
--- /dev/null
+++ b/addons/website_event_track_online/views/event_track_templates_reminder.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Options
+    * reminder_light: no text displayed
+    * reminder_small: text displayed as small
+    * light_theme: bell is white/gold if set; otherwse bell is gray / white
+ -->
+<template id="track_widget_reminder">
+    <div t-att-class="'o_wetrack_js_reminder btn d-flex align-items-center justify-content-between rounded %s %s' % (
+        'o_wetrack_reminder_light' if reminder_light else '',
+        'o_wetrack_reminder_small' if reminder_small else '')">
+        <span t-if="not reminder_light"
+              t-att-class="'o_wetrack_js_reminder_text text-white text-left mr-1 %s' % ('small d-sm-inline' if reminder_small else '')">
+            <t t-esc="'Set Reminder' if not track.is_reminder_on else 'Reminder On'"/>
+        </span>
+        <i t-att-class="'fa fa-bell%s inactive_color_%s' % ('' if track.is_reminder_on else '-o', 'dark' if reminder_light and not light_theme else 'light')"
+           t-att-data-track-id="track.id"
+           t-att-title="'Reminder On' if track.is_reminder_on else 'Set a Reminder'"
+           t-att-data-reminder-on="bool(track.is_reminder_on)"></i>
+    </div>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/event_track_views.xml b/addons/website_event_track_online/views/event_track_views.xml
new file mode 100644
index 00000000000..5f2a40903ce
--- /dev/null
+++ b/addons/website_event_track_online/views/event_track_views.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="website_visitor_action_from_track" model="ir.actions.act_window">
+        <field name="name">Visitors Wishlist</field>
+        <field name="res_model">website.visitor</field>
+        <field name="view_mode">kanban,tree,form,graph</field>
+        <field name="domain">[('event_track_wishlisted_ids', 'in', [active_id])]</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Wait for visitors to wishlist your tracks
+            </p>
+        </field>
+    </record>
+
+    <record id="event_track_view_search" model="ir.ui.view">
+        <field name="name">event.track.view.search.inherit.event.track.online</field>
+        <field name="model">event.track</field>
+        <field name="inherit_id" ref="website_event_track.view_event_track_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='message_needaction']" position="after">
+                <filter string="Always Wishlisted" name="filter_wishlisted_by_default" domain="[('wishlisted_by_default', '=', True)]"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_track_view_tree" model="ir.ui.view" >
+        <field name="name">event.track.view.tree.inherit.event.track.online</field>
+        <field name="model">event.track</field>
+        <field name="inherit_id" ref="website_event_track.view_event_track_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='event_id']" position="after">
+                <field name="wishlisted_by_default" optional="hide"/>
+                <field name="wishlist_visitor_count" optional="hide"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_track_view_form" model="ir.ui.view" >
+        <field name="name">event.track.view.form.inherit.event.track.online</field>
+        <field name="model">event.track</field>
+        <field name="inherit_id" ref="website_event_track.view_event_track_form"/>
+        <field name="arch" type="xml">
+            <field name="active" position='after'>
+                <field name="wishlisted_by_default"/>
+            </field>
+            <field name="is_published" position="before">
+                <button name="%(website_event_track_online.website_visitor_action_from_track)d"
+                        type="action"
+                        class="oe_stat_button"
+                        icon="fa-bell">
+                    <field name="wishlist_visitor_count" string="Wishlisted By" widget="statinfo"/>
+                </button>
+            </field>
+            <xpath expr="//field[@name='image']" position="replace">
+                <field name="website_image" widget="image" class="oe_avatar"/>
+            </xpath>
+            <xpath expr="//field[@name='partner_biography']" position="after">
+                <field name="image" widget="image" class="oe_avatar float-left"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_track_action_from_visitor" model="ir.actions.act_window">
+        <field name="name">Wishlisted Tracks</field>
+        <field name="res_model">event.track</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="domain">[('wishlist_visitor_ids', 'in', [active_id])]</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_empty_folder">
+                No track wishlisted by this visitor
+            </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/event_track_visitor_views.xml b/addons/website_event_track_online/views/event_track_visitor_views.xml
new file mode 100644
index 00000000000..2a90e7f5d46
--- /dev/null
+++ b/addons/website_event_track_online/views/event_track_visitor_views.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <record id="event_track_visitor_view_search" model="ir.ui.view" >
+        <field name="name">event.track.visitor.view.search</field>
+        <field name="model">event.track.visitor</field>
+        <field name="arch" type="xml">
+            <search string="Track Visitors">
+                <field name="track_id"/>
+                <field name="visitor_id"/>
+                <field name="partner_id"/>
+                <field name="is_wishlisted"/>
+                <group string="Group By" expand="0">
+                    <filter string="Track" name="groupby_track_id" context="{'group_by': 'track_id'}"/>
+                    <filter string="Visitor" name="groupby_visitor_id" context="{'group_by': 'visitor_id'}"/>
+                    <filter string="Customer" name="groupby_partner_id" context="{'group_by': 'partner_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="event_track_visitor_view_form" model="ir.ui.view">
+        <field name="name">event.track.visitor.view.form</field>
+        <field name="model">event.track.visitor</field>
+        <field name="arch" type="xml">
+            <form string="Track Visitor">
+                <sheet string="Track Visitor">
+                    <group>
+                        <group>
+                            <field name="track_id"/>
+                            <field name="is_wishlisted"/>
+                        </group>
+                        <group>
+                            <field name="visitor_id"/>
+                            <field name="partner_id"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="event_track_visitor_view_list" model="ir.ui.view">
+        <field name="name">event.track.visitor.view.list</field>
+        <field name="model">event.track.visitor</field>
+        <field name="arch" type="xml">
+            <tree string="Track Visitors">
+                <field name="track_id"/>
+                <field name="visitor_id"/>
+                <field name="partner_id"/>
+                <field name="is_wishlisted"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="event_track_visitor_action" model="ir.actions.act_window">
+        <field name="name">Track Visitors</field>
+        <field name="res_model">event.track.visitor</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+              Add a new track visitor
+            </p><p>
+              Track Visitors store statistics on track attendance, including
+              wishlist management.
+            </p>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/views/event_type_views.xml b/addons/website_event_track_online/views/event_type_views.xml
new file mode 100644
index 00000000000..f3b28139ee7
--- /dev/null
+++ b/addons/website_event_track_online/views/event_type_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<odoo><data>
+    <record id="event_type_view_form" model="ir.ui.view">
+        <field name="name">event.type.view.form.inherit.meet</field>
+        <field name="model">event.type</field>
+        <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='website_menu']" position='after'>
+                <div id="community-menu" class="row mt16" groups="base.group_no_one" attrs="{'invisible': [('website_menu', '=', False)]}">
+                    <label class="col-lg-4" for="community_menu"/> <field name="community_menu"/>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_online/views/website_visitor_views.xml b/addons/website_event_track_online/views/website_visitor_views.xml
new file mode 100644
index 00000000000..c5ee8456984
--- /dev/null
+++ b/addons/website_event_track_online/views/website_visitor_views.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="website_visitor_view_tree" model="ir.ui.view">
+        <field name="name">website.visitor.view.tree.inherit.event.track</field>
+        <field name="model">website.visitor</field>
+        <field name="inherit_id" ref="website_event_online.website_visitor_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='event_registration_count']" position="after">
+                <field name="event_track_wishlisted_count"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="website_visitor_view_form" model="ir.ui.view">
+        <field name="name">website.visitor.view.form.inherit.event.track</field>
+        <field name="model">website.visitor</field>
+        <field name="inherit_id" ref="website_event_online.website_visitor_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@id='w_visitor_visit_counter']" position="before">
+                <button name="%(website_event_track_online.event_track_action_from_visitor)d"
+                    type="action"
+                    class="oe_stat_button" icon="fa-ticket"
+                    attrs="{'invisible': [('event_track_wishlisted_count', '=', 0)]}">
+                    <field name="event_track_wishlisted_count" widget="statinfo" string="Tracks"/>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="website_visitor_view_kanban" model="ir.ui.view">
+        <field name="name">website.visitor.view.kanban.inherit.event.track</field>
+        <field name="model">website.visitor</field>
+        <field name="inherit_id" ref="website_event_online.website_visitor_view_kanban"/>
+        <field name="arch" type="xml">
+            <field name="page_ids" position="after">
+                <field name="event_track_wishlisted_count"/>
+            </field>
+            <xpath expr="//div[@id='o_page_count']" position="after">
+                <div>Wishlisted Tracks<span class="float-right font-weight-bold"><field name="event_track_wishlisted_count"/></span></div>
+            </xpath>
+            <xpath expr="//div[hasclass('w_visitor_kanban_actions_ungrouped')]" position="before">
+                <div class="col">
+                    <b><field name="event_track_wishlisted_count"/></b>
+                    <div>Wishlisted Tracks</div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_quiz/__init__.py b/addons/website_event_track_quiz/__init__.py
new file mode 100644
index 00000000000..8c67f893b37
--- /dev/null
+++ b/addons/website_event_track_quiz/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
+from . import controllers
diff --git a/addons/website_event_track_quiz/__manifest__.py b/addons/website_event_track_quiz/__manifest__.py
new file mode 100644
index 00000000000..73e245a2130
--- /dev/null
+++ b/addons/website_event_track_quiz/__manifest__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Quizzes on Tracks',
+    'category': 'Marketing/Events',
+    'sequence': 1007,
+    'version': '1.0',
+    'summary': 'Quizzes on tracks',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        'website_profile',
+        'website_event_track_session',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/assets.xml',
+        'views/event_leaderboard_templates.xml',
+        'views/event_quiz_views.xml',
+        'views/event_quiz_question_views.xml',
+        'views/event_track_views.xml',
+        'views/event_menus.xml',
+        'views/event_quiz_templates.xml',
+        'views/event_track_templates_page.xml',
+        'views/event_type_views.xml'
+    ],
+    'demo': [
+        'data/quiz_demo.xml',
+    ],
+    'application': False,
+    'installable': True,
+}
diff --git a/addons/website_event_track_quiz/controllers/__init__.py b/addons/website_event_track_quiz/controllers/__init__.py
new file mode 100644
index 00000000000..661b583bc7f
--- /dev/null
+++ b/addons/website_event_track_quiz/controllers/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_track_quiz
+from . import community
+
diff --git a/addons/website_event_track_quiz/controllers/community.py b/addons/website_event_track_quiz/controllers/community.py
new file mode 100644
index 00000000000..873a4f4fdf4
--- /dev/null
+++ b/addons/website_event_track_quiz/controllers/community.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import math
+
+from odoo import http
+from odoo.addons.http_routing.models.ir_http import slug
+from odoo.addons.website_event_track_online.controllers.community import WebsiteEventCommunityController
+from odoo.http import request
+
+
+class WebsiteEventTrackQuizCommunityController(WebsiteEventCommunityController):
+
+    _visitors_per_page = 30
+    _pager_max_pages = 5
+
+    @http.route(['/event/<model("event.event"):event>/community/leaderboard/results',
+                 '/event/<model("event.event"):event>/community/leaderboard/results/page/<int:page>'],
+                type='http', auth="public", website=True, sitemap=False)
+    def leaderboard(self, event, page=1, lang=None, **kwargs):
+        values = self._get_community_leaderboard_render_values(event, kwargs.get('search'), page)
+        return request.render('website_event_track_quiz.event_leaderboard', values)
+
+    @http.route('/event/<model("event.event"):event>/community/leaderboard',
+                type='http', auth="public", website=True, sitemap=False)
+    def community_leaderboard(self, event, **kwargs):
+        values = self._get_community_leaderboard_render_values(event, None, None)
+        return request.render('website_event_track_quiz.event_leaderboard', values)
+
+    @http.route('/event/<model("event.event"):event>/community',
+                type='http', auth="public", website=True, sitemap=False)
+    def community(self, event, **kwargs):
+        values = self._get_community_leaderboard_render_values(event, None, None)
+        return request.render('website_event_track_quiz.event_leaderboard', values)
+
+    def _get_community_leaderboard_render_values(self, event, search_term, page):
+        values = self._get_leaderboard(event, search_term)
+        values.update({'event': event, 'search': search_term})
+
+        user_count = len(values['visitors'])
+        if user_count:
+            page_count = math.ceil(user_count / self._visitors_per_page)
+            url = '/event/%s/community/leaderboard/results' % (slug(event))
+            if values.get('current_visitor_position') and not page:
+                values['scroll_to_position'] = True
+                page = math.ceil(values['current_visitor_position'] / self._visitors_per_page)
+            elif not page:
+                page = 1
+            pager = request.website.pager(url=url, total=user_count, page=page, step=self._visitors_per_page,
+                                          scope=page_count if page_count < self._pager_max_pages else self._pager_max_pages)
+            values['visitors'] = values['visitors'][(page - 1) * self._visitors_per_page: (page) * self._visitors_per_page]
+        else:
+            pager = {'page_count': 0}
+        values.update({'pager': pager})
+        return values
+
+    def _get_leaderboard(self, event, searched_name=None):
+        current_visitor = request.env['website.visitor']._get_visitor_from_request(force_create=False)
+        track_visitor_data = request.env['event.track.visitor'].sudo().read_group(
+            [('track_id', 'in', event.track_ids.ids),
+             ('visitor_id', '!=', False),
+             ('quiz_points', '>', 0)],
+            ['id', 'visitor_id', 'points:sum(quiz_points)'],
+            ['visitor_id'], orderby="points DESC")
+        data_map = {datum['visitor_id'][0]: datum['points'] for datum in track_visitor_data if datum.get('visitor_id')}
+        leaderboard = []
+        position = 1
+        current_visitor_position = False
+        visitors_by_id = {
+            visitor.id: visitor
+            for visitor in request.env['website.visitor'].sudo().browse(data_map.keys())
+        }
+        for visitor_id, points in data_map.items():
+            visitor = visitors_by_id.get(visitor_id)
+            if not visitor:
+                continue
+            if (searched_name and searched_name.lower() in visitor.display_name.lower()) or not searched_name:
+                leaderboard.append({'visitor': visitor, 'points': points, 'position': position})
+                if current_visitor and current_visitor == visitor:
+                    current_visitor_position = position
+            position = position + 1
+
+        return {
+            'top3_visitors': leaderboard[:3] if len(leaderboard) >= 3 else False,
+            'visitors': leaderboard,
+            'current_visitor_position': current_visitor_position,
+            'current_visitor': current_visitor,
+            'searched_name': searched_name
+        }
diff --git a/addons/website_event_track_quiz/controllers/event_track_quiz.py b/addons/website_event_track_quiz/controllers/event_track_quiz.py
new file mode 100644
index 00000000000..2942313a680
--- /dev/null
+++ b/addons/website_event_track_quiz/controllers/event_track_quiz.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import http
+from odoo.addons.website_event_track_session.controllers.session import WebsiteEventSessionController
+from odoo.http import request
+
+
+class WebsiteEventTrackQuiz(WebsiteEventSessionController):
+
+    # QUIZZES IN PAGE
+    # ----------------------------------------------------------
+
+    @http.route('/event_track/quiz/submit', type="json", auth="public", website=True)
+    def event_track_quiz_submit(self, event_id, track_id, answer_ids):
+        track = self._fetch_track(track_id)
+
+        event_track_visitor = track._get_event_track_visitors(force_create=True)
+        visitor_sudo = event_track_visitor.visitor_id
+        if event_track_visitor.quiz_completed:
+            return {'error': 'track_quiz_done'}
+
+        answers_details = self._get_quiz_answers_details(track, answer_ids)
+        if answers_details.get('error'):
+            return answers_details
+
+        event_track_visitor.write({
+            'quiz_completed': True,
+            'quiz_points': answers_details['points'],
+        })
+
+        result = {
+            'answers': {
+                answer.question_id.id: {
+                    'is_correct': answer.is_correct,
+                    'comment': answer.comment
+                } for answer in answers_details['user_answers']
+            },
+            'quiz_completed': event_track_visitor.quiz_completed,
+            'quiz_points': answers_details['points']
+        }
+        if visitor_sudo and request.httprequest.cookies.get('visitor_uuid', '') != visitor_sudo.access_token:
+            result['visitor_uuid'] = visitor_sudo.access_token
+        return result
+
+    @http.route('/event_track/quiz/reset', type="json", auth="user", website=True)
+    def quiz_reset(self, event_id, track_id):
+        track = self._fetch_track(track_id)
+
+        event_track_visitor = track._get_event_track_visitors(force_create=True)
+        event_track_visitor.write({
+            'quiz_completed': False,
+            'quiz_points': 0,
+        })
+
+    def _get_quiz_answers_details(self, track, answer_ids):
+        # TDE FIXME: lost sudo
+        questions_count = request.env['event.quiz.question'].sudo().search_count([('quiz_id', '=', track.sudo().quiz_id.id)])
+        user_answers = request.env['event.quiz.answer'].sudo().search([('id', 'in', answer_ids)])
+
+        if len(user_answers.mapped('question_id')) != questions_count:
+            return {'error': 'quiz_incomplete'}
+
+        return {
+            'user_answers': user_answers,
+            'points': sum([
+                answer.awarded_points
+                for answer in user_answers.filtered(lambda answer: answer.is_correct)
+            ])
+        }
diff --git a/addons/website_event_track_quiz/data/quiz_demo.xml b/addons/website_event_track_quiz/data/quiz_demo.xml
new file mode 100644
index 00000000000..6ff1f05b14f
--- /dev/null
+++ b/addons/website_event_track_quiz/data/quiz_demo.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="event_7_track_1_quiz" model="event.quiz">
+        <field name="name">What This Event Is All About</field>
+    </record>
+
+    <record id="event_7_track_1_question_0" model="event.quiz.question">
+        <field name="name">What will we talk about during this event ?</field>
+        <field name="sequence">1</field>
+        <field name="quiz_id" ref="website_event_track_quiz.event_7_track_1_quiz"/>
+    </record>
+    <record id="event_7_track_1_question_0_0" model="event.quiz.answer">
+        <field name="text_value">Wood</field>
+        <field name="sequence">1</field>
+        <field name="awarded_points">1</field>
+        <field name="comment">Correct ! You're really smart !</field>
+        <field name="question_id" ref="event_7_track_1_question_0"/>
+    </record>
+    <record id="event_7_track_1_question_0_1" model="event.quiz.answer">
+        <field name="text_value">Music</field>
+        <field name="sequence">2</field>
+        <field name="comment">Incorrect ! Even if there will be some.</field>
+        <field name="question_id" ref="event_7_track_1_question_0"/>
+    </record>
+    <record id="event_7_track_1_question_0_2" model="event.quiz.answer">
+        <field name="text_value">Open Source Apps</field>
+        <field name="sequence">3</field>
+        <field name="comment">Incorrect ! OpenWood is not an Open Source congres about Apps.</field>
+        <field name="question_id" ref="event_7_track_1_question_0"/>
+    </record>
+    <record id="event_7_track_1_question_1" model="event.quiz.question">
+        <field name="name">Where does lumber comes from ?</field>
+        <field name="sequence">2</field>
+        <field name="quiz_id" ref="website_event_track_quiz.event_7_track_1_quiz"/>
+    </record>
+    <record id="event_7_track_1_question_1_0" model="event.quiz.answer">
+        <field name="text_value">Trees !</field>
+        <field name="sequence">1</field>
+        <field name="awarded_points">1</field>
+        <field name="comment">Correct !</field>
+        <field name="question_id" ref="event_7_track_1_question_1"/>
+    </record>
+    <record id="event_7_track_1_question_1_1" model="event.quiz.answer">
+        <field name="text_value">Stores !</field>
+        <field name="sequence">2</field>
+        <field name="comment">Incorrect ! Lumbers need first to be cut from trees!</field>
+        <field name="question_id" ref="event_7_track_1_question_1"/>
+    </record>
+
+    <record id="website_event_track.event_7_track_1" model="event.track">
+        <field name="quiz_id" ref="website_event_track_quiz.event_7_track_1_quiz"/>
+    </record>
+
+    <record id="event_7_track_5_quiz" model="event.quiz">
+        <field name="name">Securing your Lumber during transport</field>
+    </record>
+
+    <record id="event_7_track_5_question_0" model="event.quiz.question">
+        <field name="name">Transporting lumber from stores to your house is safe.</field>
+        <field name="sequence">1</field>
+        <field name="quiz_id" ref="website_event_track_quiz.event_7_track_5_quiz"/>
+    </record>
+    <record id="event_7_track_5_question_0_0" model="event.quiz.answer">
+        <field name="text_value">Yes</field>
+        <field name="sequence">1</field>
+        <field name="comment">Incorrect! In order to avoid accident, you need to secure any product of this kind during transportation!</field>
+        <field name="question_id" ref="event_7_track_5_question_0"/>
+    </record>
+    <record id="event_7_track_5_question_0_1" model="event.quiz.answer">
+        <field name="text_value">No</field>
+        <field name="sequence">2</field>
+        <field name="awarded_points">1</field>
+        <field name="comment">Correct! Even if you have a big trunk, some long products need to be secured.</field>
+        <field name="question_id" ref="event_7_track_5_question_0"/>
+    </record>
+    <record id="event_7_track_5_question_1" model="event.quiz.question">
+        <field name="name">What kind of tool are needed to secure your lumber ?</field>
+        <field name="sequence">2</field>
+        <field name="quiz_id" ref="website_event_track_quiz.event_7_track_5_quiz"/>
+    </record>
+    <record id="event_7_track_5_question_1_0" model="event.quiz.answer">
+        <field name="text_value">Hammer</field>
+        <field name="sequence">1</field>
+        <field name="comment">Incorrect! Hammer won't be of any help here!</field>
+        <field name="question_id" ref="event_7_track_5_question_1"/>
+    </record>
+    <record id="event_7_track_5_question_1_1" model="event.quiz.answer">
+        <field name="text_value">Tie-down straps and other wooden blocks</field>
+        <field name="sequence">2</field>
+        <field name="awarded_points">1</field>
+        <field name="comment">Correct!</field>
+        <field name="question_id" ref="event_7_track_5_question_1"/>
+    </record>
+        <record id="event_7_track_5_question_1_2" model="event.quiz.answer">
+        <field name="text_value">Scotch tape</field>
+        <field name="sequence">3</field>
+        <field name="comment">Incorrect! Well, it could work but you will need a lot of tape!</field>
+        <field name="question_id" ref="event_7_track_5_question_1"/>
+    </record>
+
+    <record id="website_event_track.event_7_track_5" model="event.track">
+        <field name="quiz_id" ref="website_event_track_quiz.event_7_track_5_quiz"/>
+    </record>
+
+    <record id="event_7_track_13_quiz" model="event.quiz">
+        <field name="name">Pretty. Ugly. Lovely.</field>
+    </record>
+
+    <record id="event_7_track_13_question_0" model="event.quiz.question">
+        <field name="name">What kind of wall is transformed here ?</field>
+        <field name="sequence">1</field>
+        <field name="quiz_id" ref="website_event_track_quiz.event_7_track_13_quiz"/>
+    </record>
+    <record id="event_7_track_13_question_0_0" model="event.quiz.answer">
+        <field name="text_value">Concrete Blocks Wall</field>
+        <field name="sequence">1</field>
+        <field name="awarded_points">1</field>
+        <field name="comment">Correct!</field>
+        <field name="question_id" ref="event_7_track_13_question_0"/>
+    </record>
+    <record id="event_7_track_13_question_0_1" model="event.quiz.answer">
+        <field name="text_value">Steel Wall</field>
+        <field name="sequence">2</field>
+        <field name="comment">Incorrect!</field>
+        <field name="question_id" ref="event_7_track_13_question_0"/>
+    </record>
+    <record id="event_7_track_13_question_0_2" model="event.quiz.answer">
+        <field name="text_value">Mud Wall</field>
+        <field name="sequence">3</field>
+        <field name="comment">Incorrect!</field>
+        <field name="question_id" ref="event_7_track_13_question_0"/>
+    </record>
+
+    <record id="website_event_track.event_7_track_13" model="event.track">
+        <field name="quiz_id" ref="website_event_track_quiz.event_7_track_13_quiz"/>
+    </record>
+    <record id="event.event_7" model="event.event">
+        <field name="community_menu" eval="True"/>
+    </record>
+
+    <record id="event_track_visitor_admin_event_7_track_1" model="event.track.visitor">
+        <field name="track_id" ref="website_event_track.event_7_track_1"/>
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_0"/>
+        <field name="quiz_completed" eval="True"/>
+        <field name="quiz_points">3</field>
+    </record>
+
+    <record id="event_track_visitor_demo_event_7_track_1" model="event.track.visitor">
+        <field name="track_id" ref="website_event_track.event_7_track_1"/>
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_1"/>
+        <field name="quiz_completed" eval="True"/>
+        <field name="quiz_points">2</field>
+    </record>
+
+    <record id="event_track_visitor_portal_event_7_track_1" model="event.track.visitor">
+        <field name="track_id" ref="website_event_track.event_7_track_1"/>
+        <field name="visitor_id" ref="website_event_online.website_visitor_event_2"/>
+        <field name="quiz_completed" eval="True"/>
+        <field name="quiz_points">1</field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_quiz/models/__init__.py b/addons/website_event_track_quiz/models/__init__.py
new file mode 100644
index 00000000000..dd66c4ecd9e
--- /dev/null
+++ b/addons/website_event_track_quiz/models/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_track
+from . import event_track_visitor
+from . import event_quiz
diff --git a/addons/website_event_track_quiz/models/event_quiz.py b/addons/website_event_track_quiz/models/event_quiz.py
new file mode 100644
index 00000000000..c9eafa5b7d5
--- /dev/null
+++ b/addons/website_event_track_quiz/models/event_quiz.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class Quiz(models.Model):
+    _name = "event.quiz"
+    _description = "Quiz"
+
+    name = fields.Char('Name', required=True, translate=True)
+    question_ids = fields.One2many('event.quiz.question', 'quiz_id', string="Questions")
+    event_track_ids = fields.One2many('event.track', 'quiz_id', string="Tracks")
+    event_track_id = fields.Many2one(
+        'event.track', compute='_compute_event_track_id',
+        readonly=True, store=True)
+    event_id = fields.Many2one(
+        'event.event', related='event_track_id.event_id',
+        readonly=True, store=True)
+
+    @api.depends('event_track_ids.quiz_id')
+    def _compute_event_track_id(self):
+        for quiz in self:
+            quiz.event_track_id = quiz.event_track_ids[0] if quiz.event_track_ids else False
+
+
+class QuizQuestion(models.Model):
+    _name = "event.quiz.question"
+    _description = "Content Quiz Question"
+    _order = "quiz_id, sequence, id"
+
+    name = fields.Char("Question", required=True, translate=True)
+    sequence = fields.Integer("Sequence")
+    quiz_id = fields.Many2one("event.quiz", "Quiz", required=True, ondelete='cascade')
+    awarded_points = fields.Integer("Number of Points", compute='_compute_awarded_points')
+    answer_ids = fields.One2many('event.quiz.answer', 'question_id', string="Answer")
+
+    @api.depends('answer_ids.awarded_points')
+    def _compute_awarded_points(self):
+        for question in self:
+            question.awarded_points = sum(question.answer_ids.mapped('awarded_points'))
+
+    @api.constrains('answer_ids')
+    def _check_answers_integrity(self):
+        for question in self:
+            if len(question.answer_ids.filtered(lambda answer: answer.awarded_points)) != 1:
+                raise ValidationError(_('Question "%s" must have 1 correct answer') % question.name)
+            if len(question.answer_ids) < 2:
+                raise ValidationError(_('Question "%s" must have 1 correct answer and at least 1 invalid answer') % question.name)
+
+
+class QuizAnswer(models.Model):
+    _name = "event.quiz.answer"
+    _rec_name = "text_value"
+    _description = "Question's Answer"
+    _order = 'question_id, sequence, id'
+
+    sequence = fields.Integer("Sequence")
+    question_id = fields.Many2one('event.quiz.question', string="Question", required=True, ondelete='cascade')
+    text_value = fields.Char("Answer", required=True, translate=True)
+    is_correct = fields.Boolean("Is correct answer", compute='_compute_is_correct')
+    comment = fields.Text("Comment", translate=True,
+        help='''This comment will be displayed to the user if he selects this answer, after submitting the quiz.
+                It is used as a small informational text helping to understand why this answer is correct / incorrect.''')
+    awarded_points = fields.Integer('Number of Points')
+
+    @api.depends('awarded_points')
+    def _compute_is_correct(self):
+        for answer in self:
+            answer.is_correct = bool(answer.awarded_points)
diff --git a/addons/website_event_track_quiz/models/event_track.py b/addons/website_event_track_quiz/models/event_track.py
new file mode 100644
index 00000000000..3011b98a309
--- /dev/null
+++ b/addons/website_event_track_quiz/models/event_track.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+from odoo.osv import expression
+
+
+class EventTrack(models.Model):
+    _inherit = ['event.track']
+
+    quiz_id = fields.Many2one('event.quiz', string="Quiz", groups="event.group_event_user")
+    quiz_questions_count = fields.Integer(string="# Quiz Questions", compute='_compute_quiz_questions_count', groups="event.group_event_user")
+    is_quiz_completed = fields.Boolean('Is Quiz Done', compute='_compute_quiz_data')
+    quiz_points = fields.Integer('Quiz Points', compute='_compute_quiz_data')
+
+    @api.depends('quiz_id.question_ids')
+    def _compute_quiz_questions_count(self):
+        for track in self:
+            track.quiz_questions_count = len(track.quiz_id.question_ids)
+
+    @api.depends('quiz_id', 'event_track_visitor_ids.visitor_id',
+                 'event_track_visitor_ids.partner_id', 'event_track_visitor_ids.quiz_completed',
+                 'event_track_visitor_ids.quiz_points')
+    @api.depends_context('uid')
+    def _compute_quiz_data(self):
+        tracks_quiz = self.filtered(lambda track: track.quiz_id)
+        (self - tracks_quiz).is_quiz_completed = False
+        (self - tracks_quiz).quiz_points = 0
+        if tracks_quiz:
+            current_visitor = self.env['website.visitor']._get_visitor_from_request(force_create=False)
+            if self.env.user._is_public() and not current_visitor:
+                for track in tracks_quiz:
+                    track.is_quiz_completed = False
+                    track.quiz_points = 0
+            else:
+                if self.env.user._is_public():
+                    domain = [('visitor_id', '=', current_visitor.id)]
+                elif current_visitor:
+                    domain = [
+                        '|',
+                        ('partner_id', '=', self.env.user.partner_id.id),
+                        ('visitor_id', '=', current_visitor.id)
+                    ]
+                else:
+                    domain = [('partner_id', '=', self.env.user.partner_id.id)]
+
+                event_track_visitors = self.env['event.track.visitor'].sudo().search_read(
+                    expression.AND([
+                        domain,
+                        [('track_id', 'in', tracks_quiz.ids)]
+                    ]), fields=['track_id', 'quiz_completed', 'quiz_points']
+                )
+
+                quiz_visitor_map = {
+                    track_visitor['track_id'][0]: {
+                        'quiz_completed': track_visitor['quiz_completed'],
+                        'quiz_points': track_visitor['quiz_points']
+                    } for track_visitor in event_track_visitors
+                }
+                for track in tracks_quiz:
+                    if quiz_visitor_map.get(track.id):
+                        track.is_quiz_completed = quiz_visitor_map[track.id]['quiz_completed']
+                        track.quiz_points = quiz_visitor_map[track.id]['quiz_points']
+                    else:
+                        track.is_quiz_completed = False
+                        track.quiz_points = 0
diff --git a/addons/website_event_track_quiz/models/event_track_visitor.py b/addons/website_event_track_quiz/models/event_track_visitor.py
new file mode 100644
index 00000000000..73376504dfe
--- /dev/null
+++ b/addons/website_event_track_quiz/models/event_track_visitor.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class TrackVisitor(models.Model):
+    _name = 'event.track.visitor'
+    _inherit = ['event.track.visitor']
+
+    quiz_completed = fields.Boolean('Completed')
+    quiz_points = fields.Integer("Quiz Points", default=0)
diff --git a/addons/website_event_track_quiz/security/ir.model.access.csv b/addons/website_event_track_quiz/security/ir.model.access.csv
new file mode 100644
index 00000000000..9ccf65851a7
--- /dev/null
+++ b/addons/website_event_track_quiz/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+event_quiz_access_event_user,event.quiz.access.event.user,model_event_quiz,event.group_event_user,1,0,0,0
+event_quiz_access_event_manager,event.quiz.access.event.manager,model_event_quiz,event.group_event_manager,1,1,1,1
+event_quiz_question_access_event_user,event.quiz.question.access.event.user,model_event_quiz_question,event.group_event_user,1,0,0,0
+event_quiz_question_access_event_manager,event.quiz.question.access.event.manager,model_event_quiz_question,event.group_event_manager,1,1,1,1
+event_quiz_answer_access_event_user,event.quiz.answer.event.user,model_event_quiz_answer,event.group_event_user,1,0,0,0
+event_quiz_answer_access_event_manager,event.quiz.answer.event.manager,model_event_quiz_answer,event.group_event_manager,1,1,1,1
diff --git a/addons/website_event_track_quiz/static/src/js/event_quiz.js b/addons/website_event_track_quiz/static/src/js/event_quiz.js
new file mode 100644
index 00000000000..c6adddc35c8
--- /dev/null
+++ b/addons/website_event_track_quiz/static/src/js/event_quiz.js
@@ -0,0 +1,323 @@
+odoo.define('website_event_track_quiz.event.quiz', function (require) {
+
+'use strict';
+
+var publicWidget = require('web.public.widget');
+var core = require('web.core');
+var session = require('web.session');
+var utils = require('web.utils');
+
+var QWeb = core.qweb;
+var _t = core._t;
+
+/**
+ * This widget is responsible of displaying quiz questions and propositions. Submitting the quiz will fetch the
+ * correction and decorate the answers according to the result. Error message can be displayed.
+ *
+ * This widget can be attached to DOM rendered server-side by `gamification_quiz.`
+ *
+ */
+var Quiz = publicWidget.Widget.extend({
+    template: 'quiz.main',
+    xmlDependencies: ['/website_event_track_quiz/static/src/xml/quiz_templates.xml'],
+    events: {
+        "click .o_quiz_quiz_answer": '_onAnswerClick',
+        "click .o_quiz_js_quiz_submit": '_submitQuiz',
+        "click .o_quiz_js_quiz_reset": '_onClickReset',
+    },
+
+    /**
+    * @override
+    * @param {Object} parent
+    * @param {Object} data holding all the container information
+    * @param {Object} quizData : quiz data to display
+    */
+    init: function (parent, data, quizData) {
+        this._super.apply(this, arguments);
+        this.track = _.defaults(data, {
+            id: 0,
+            name: '',
+            eventId: '',
+            completed: false,
+            isMember: false,
+            progressBar: false,
+            isManager: false
+        });
+        this.quiz = quizData || false;
+        if (this.quiz) {
+            this.quiz.questionsCount = quizData.questions.length;
+        }
+        this.isMember = data.isMember || false;
+        this.userId = session.user_id;
+        this.redirectURL = encodeURIComponent(document.URL);
+    },
+
+    /**
+     * @override
+     */
+    willStart: function () {
+        var defs = [this._super.apply(this, arguments)];
+        if (!this.quiz) {
+            defs.push(this._fetchQuiz());
+        }
+        return Promise.all(defs);
+    },
+
+    /**
+     * Overridden to add custom rendering behavior upon start of the widget.
+     *
+     * If the user has answered the quiz before having joined the course, we check
+     * his answers (saved into his session) here as well.
+     *
+     * @override
+     */
+    start: function () {
+        var self = this;
+        return this._super.apply(this, arguments).then(function ()  {
+            self._renderValidationInfo();
+        });
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _alertShow: function (alertCode) {
+        var message = _t('There was an error validating this quiz.');
+        if (alertCode === 'quiz_incomplete') {
+            message = _t('All questions must be answered !');
+        } else if (alertCode === 'quiz_done') {
+            message = _t('This quiz is already done. Retaking it is not possible.');
+        }
+
+        this.displayNotification({
+            type: 'warning',
+            title: _t('Quiz validation error'),
+            message: message,
+            sticky: true
+        });
+    },
+
+    /**
+     * Get all the questions ID from the displayed Quiz
+     * @returns {Array}
+     * @private
+     */
+    _getQuestionsIds: function () {
+        return this.$('.o_quiz_js_quiz_question').map(function () {
+            return $(this).data('question-id');
+        }).get();
+    },
+
+    /**
+     * @private
+     * Decorate the answers according to state
+     */
+    _disableAnswers: function () {
+        var self = this;
+        this.$('.o_quiz_js_quiz_question').addClass('completed-disabled');
+        this.$('input[type=radio]').each(function () {
+            $(this).prop('disabled', self.track.completed);
+        });
+    },
+
+    /**
+     * Decorate the answer inputs according to the correction and adds the answer comment if
+     * any.
+     *
+     * @private
+     */
+    _renderAnswersHighlightingAndComments: function () {
+        var self = this;
+        this.$('.o_quiz_js_quiz_question').each(function () {
+            var $question = $(this);
+            var questionId = $question.data('questionId');
+            var isCorrect = self.quiz.answers[questionId].is_correct;
+            $question.find('a.o_quiz_quiz_answer').each(function () {
+                var $answer = $(this);
+                $answer.find('i.fa').addClass('d-none');
+                if ($answer.find('input[type=radio]')[0].checked) {
+                    if (isCorrect) {
+                        $answer.removeClass('list-group-item-danger').addClass('list-group-item-success');
+                        $answer.find('i.fa-check-circle').removeClass('d-none');
+                    } else {
+                        $answer.removeClass('list-group-item-success').addClass('list-group-item-danger');
+                        $answer.find('i.fa-times-circle').removeClass('d-none');
+                        $answer.find('label input').prop('checked', false);
+                    }
+                } else {
+                    $answer.removeClass('list-group-item-danger list-group-item-success');
+                    $answer.find('i.fa-circle').removeClass('d-none');
+                }
+            });
+            var comment = self.quiz.answers[questionId].comment;
+            if (comment) {
+                $question.find('.o_quiz_quiz_answer_info').removeClass('d-none');
+                $question.find('.o_quiz_quiz_answer_comment').text(comment);
+            }
+        });
+    },
+
+    /*
+        * @private
+        * Update validation box (karma, buttons) according to widget state
+        */
+    _renderValidationInfo: function () {
+        var $validationElem = this.$('.o_quiz_js_quiz_validation');
+        $validationElem.html(
+            QWeb.render('quiz.validation', {'widget': this})
+        );
+    },
+
+    /**
+     * Get the quiz answers filled in by the User
+     *
+     * @private
+     */
+    _getQuizAnswers: function () {
+        return this.$('input[type=radio]:checked').map(function (index, element) {
+            return parseInt($(element).val());
+        }).get();
+    },
+
+    /**
+     * Submit a quiz and get the correction. It will display messages
+     * according to quiz result.
+     *
+     * @private
+     */
+    _submitQuiz: function () {
+        var self = this;
+
+        return this._rpc({
+            route: '/event_track/quiz/submit',
+            params: {
+                event_id: self.track.eventId,
+                track_id: self.track.id,
+                answer_ids: this._getQuizAnswers(),
+            }
+        }).then(function (data) {
+            if (data.error) {
+                self._alertShow(data.error);
+            } else {
+                self.quiz = _.extend(self.quiz, data);
+                self.quiz.quizPointsGained = data.quiz_points;
+                if (data.quiz_completed) {
+                    self._disableAnswers();
+                    self.track.completed = data.quiz_completed;
+                }
+                self._renderAnswersHighlightingAndComments();
+                self._renderValidationInfo();
+                if (data.visitor_uuid) {
+                    utils.set_cookie('visitor_uuid', data.visitor_uuid);
+                }
+            }
+
+            return Promise.resolve(data);
+        });
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * When clicking on an answer, this one should be marked as "checked".
+     *
+     * @private
+     * @param OdooEvent ev
+     */
+    _onAnswerClick: function (ev) {
+        ev.preventDefault();
+        if (!this.track.completed) {
+            $(ev.currentTarget).find('input[type=radio]').prop('checked', true);
+        }
+    },
+
+    /**
+     * Resets the completion of the track so the user can take
+     * the quiz again
+     *
+     * @private
+     */
+    _onClickReset: function () {
+        this._rpc({
+            route: '/event_track/quiz/reset',
+            params: {
+                event_id: this.track.eventId,
+                track_id: this.track.id
+            }
+        }).then(function () {
+            window.location.reload();
+        });
+    },
+
+});
+
+publicWidget.registry.Quiz = publicWidget.Widget.extend({
+    selector: '.o_quiz_main',
+
+    //----------------------------------------------------------------------
+    // Public
+    //----------------------------------------------------------------------
+
+    /**
+     * @override
+     * @param {Object} parent
+     */
+    start: function () {
+        var self = this;
+        this.quizWidgets = [];
+        var defs = [this._super.apply(this, arguments)];
+        this.$('.o_quiz_js_quiz').each(function () {
+            var data = $(this).data();
+            data.quizData = {
+                questions: self._extractQuestionsAndAnswers(),
+                sessionAnswers: data.sessionAnswers || [],
+                quizKarmaMax: data.quizKarmaMax,
+                quizKarmaWon: data.quizKarmaWon,
+                quizKarmaGain: data.quizKarmaGain,
+                quizPointsGained: data.quizPointsGained,
+                quizAttemptsCount: data.quizAttemptsCount,
+            };
+            defs.push(new Quiz(self, data, data.quizData).attachTo($(this)));
+        });
+        return Promise.all(defs);
+    },
+
+    //----------------------------------------------------------------------
+    // Private
+    //---------------------------------------------------------------------
+
+    /**
+     * Extract data from exiting DOM rendered server-side, to have the list of questions with their
+     * relative answers.
+     * This method should return the same format as /gamification_quiz/quiz/get controller.
+     *
+     * @return {Array<Object>} list of questions with answers
+     */
+    _extractQuestionsAndAnswers: function () {
+        var questions = [];
+        this.$('.o_quiz_js_quiz_question').each(function () {
+            var $question = $(this);
+            var answers = [];
+            $question.find('.o_quiz_quiz_answer').each(function () {
+                var $answer = $(this);
+                answers.push({
+                    id: $answer.data('answerId'),
+                    text: $answer.data('text'),
+                });
+            });
+            questions.push({
+                id: $question.data('questionId'),
+                title: $question.data('title'),
+                answer_ids: answers,
+            });
+        });
+        return questions;
+    },
+});
+
+return Quiz;
+
+});
diff --git a/addons/website_event_track_quiz/static/src/js/event_quiz_leaderboard.js b/addons/website_event_track_quiz/static/src/js/event_quiz_leaderboard.js
new file mode 100644
index 00000000000..f624a852a8f
--- /dev/null
+++ b/addons/website_event_track_quiz/static/src/js/event_quiz_leaderboard.js
@@ -0,0 +1,34 @@
+odoo.define('website_event_track_quiz.event_leaderboard', function (require) {
+
+'use strict';
+
+var publicWidget = require('web.public.widget');
+
+publicWidget.registry.EventLeaderboard = publicWidget.Widget.extend({
+    selector: '.o_wevent_quiz_leaderboard',
+
+    /**
+     * Basic override to scroll to current visitor's position.
+     */
+    start: function () {
+        var self = this;
+        return this._super(...arguments).then(function () {
+            var $scrollTo = self.$('.o_wevent_quiz_scroll_to');
+            if ($scrollTo.length !== 0) {
+                var offset = $('.o_header_standard').height();
+                var $appMenu = $('.o_main_navbar');
+                if ($appMenu.length !== 0) {
+                    offset += $appMenu.height();
+                }
+                window.scrollTo({
+                    top: $scrollTo.offset().top - offset,
+                    behavior: 'smooth'
+                });
+            }
+        });
+    }
+});
+
+return publicWidget.registry.EventLeaderboard;
+
+});
diff --git a/addons/website_event_track_quiz/static/src/scss/event_quiz.scss b/addons/website_event_track_quiz/static/src/scss/event_quiz.scss
new file mode 100644
index 00000000000..ca441d4df4d
--- /dev/null
+++ b/addons/website_event_track_quiz/static/src/scss/event_quiz.scss
@@ -0,0 +1,92 @@
+// Retrive the tab's height by summ its properties
+$o-wslides-tabs-height: ($nav-link-padding-y*2) + ($font-size-base * $line-height-base);
+
+// Overal page bg-color: Blend it 'over' the color chosen by the user
+// ($body-bg), rather than force it replacing the variable's value.
+$o-wslides-color-bg: mix($body-bg, #efeff4);
+
+$o-wslides-color-dark1: #47525f;
+$o-wslides-color-dark2: #1f262d;
+$o-wslides-color-dark3: #101216;
+$o-wslides-fs-side-width: 300px;
+
+
+// Common to new slides pages
+// **************************************************
+.o_quiz_gradient {
+    background-image: linear-gradient(120deg, #875A7B, darken(#875A7B, 10%));
+}
+
+.o_quiz_main {
+    background-color: $o-wslides-color-bg;
+
+    .o_wslides_home_nav {
+        top: -40px;
+
+        @include media-breakpoint-up(lg) {
+            font-size: 1rem;
+
+            .o_wslides_nav_navbar_right {
+                padding-left: $spacer;
+                margin-left: auto;
+                border-left: 1px solid $border-color;
+            }
+        }
+    }
+
+    .o_quiz_js_quiz {
+        i.o_quiz_js_quiz_icon {
+            cursor: pointer;
+        }
+
+        i.o_quiz_js_quiz_icon:hover {
+            color: black !important;
+        }
+    }
+
+    .o_quiz_js_quiz_question {
+        .list-group-item  {
+            font-size: 1rem;
+
+            input:checked + i.fa-circle {
+                color: $primary !important;
+            }
+        }
+
+        &.disabled {
+            opacity: 0.5;
+            pointer-events: none;
+        }
+
+        &.completed-disabled{
+            pointer-events: none;
+        }
+    }
+
+    a.o_quiz_js_quiz_is_correct {
+        color: black;
+        input:checked + i.fa-check-circle-o {
+            color: $primary !important;
+        }
+    }
+
+    .o_quiz_js_quiz_sequence_highlight {
+        background-color: #1252F3;
+        height: 1px;
+        z-index: 3;
+
+        &:before, &:after {
+            content: "";
+            @include size(6px);
+            display: block;
+            border-radius: 100%;
+            background-color: inherit;
+            @include o-position-absolute(-2px, -2px);
+        }
+
+        &:after {
+            right: auto;
+            left: -2px;
+        }
+    }
+}
diff --git a/addons/website_event_track_quiz/static/src/xml/quiz_templates.xml b/addons/website_event_track_quiz/static/src/xml/quiz_templates.xml
new file mode 100644
index 00000000000..fe800c7fa05
--- /dev/null
+++ b/addons/website_event_track_quiz/static/src/xml/quiz_templates.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-name="quiz.main">
+        <div class="h-100 w-100 overflow-auto px-2 py-2">
+            <div class="container">
+                <div t-foreach="widget.quiz.questions" t-as="question"
+                     t-attf-class="o_quiz_js_quiz_question mt-3 mb-4 #{widget.track.completed ? 'completed-disabled' : ''}"
+                     t-att-data-question-id="question.id" t-att-data-title="question.question">
+                    <div class="h4">
+                        <small class="text-muted"><span t-esc="question_index+1"/>. </small> <span t-esc="question.question"/>
+                    </div>
+                    <div class="list-group">
+                        <t t-foreach="question.answer_ids" t-as="answer">
+                            <a t-att-data-answer-id="answer.id" href="#"
+                                t-att-data-text="answer.text_value"
+                                t-attf-class="o_quiz_quiz_answer list-group-item d-flex align-items-center list-group-item-action #{widget.track.completed  &amp;&amp; answer.is_correct ? 'list-group-item-success' : '' }">
+
+                                <label class="my-0 d-flex align-items-center justify-content-center mr-2">
+                                    <input type="radio"
+                                        t-att-name="question.id"
+                                        t-att-value="answer.id"
+                                        class="d-none"/>
+                                    <i t-att-class="'fa fa-circle text-400' + (!(widget.track.completed &amp;&amp; answer.is_correct) ? '' : ' d-none')"></i>
+                                    <i class="fa fa-times-circle text-danger d-none"></i>
+                                    <i t-att-class="'fa fa-check-circle text-success' + (widget.track.completed &amp;&amp; answer.is_correct ? '' :  ' d-none')"></i>
+                                </label>
+                                <span t-esc="answer.text_value"/>
+                            </a>
+                        </t>
+                        <div class="o_quiz_quiz_answer_info list-group-item list-group-item-info d-none">
+                            <i class="fa fa-info-circle"/>
+                            <span class="o_quiz_quiz_answer_comment"/>
+                        </div>
+                    </div>
+                </div>
+                <div t-if="!widget.track.completed" class="o_quiz_js_quiz_validation border-top pt-3"/>
+                <div t-else="" class="row">
+                    <div class="o_quiz_js_quiz_validation col py-2 bg-100 mb-2 border-bottom"/>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="quiz.validation">
+        <div id="validation">
+            <div class="d-flex align-items-center justify-content-between">
+                <div t-att-class="'d-flex align-items-center' + (widget.track.completed ? ' alert alert-success my-0 py-1 px-3' : '')">
+                    <button t-if="!widget.track.completed" role="button" title="Check answers" aria-label="Check answers"
+                        class="btn btn-primary text-uppercase font-weight-bold o_quiz_js_quiz_submit">Check your answers</button>
+                    <b t-else="" class="my-0 h5">Done !</b>
+                    <span class="my-0 h5" style="line-height: 1">
+                        <span t-if="widget.track.completed" role="button" title="Succeed and gain karma" aria-label="Succeed and gain karma" class="badge badge-pill badge-warning text-white font-weight-bold ml-3 px-2">
+                            + <t t-esc="widget.quiz.quizPointsGained || 0"/> Points
+                        </span>
+                    </span>
+                </div>
+                <div class="flex-grow-1 text-right">
+                    <button t-if="widget.track.isManager"
+                       class="d-none d-md-inline-block btn btn-light border o_quiz_js_quiz_reset">
+                        Reset
+                    </button>
+                </div>
+            </div>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/website_event_track_quiz/views/assets.xml b/addons/website_event_track_quiz/views/assets.xml
new file mode 100644
index 00000000000..c20fee1ee80
--- /dev/null
+++ b/addons/website_event_track_quiz/views/assets.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<odoo><data>
+    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Track Quiz Frontend Assets">
+        <xpath expr="//link[last()]" position="after">
+            <link rel="stylesheet" type="text/scss" href="/website_event_track_quiz/static/src/scss/event_quiz.scss" t-ignore="true"/>
+        </xpath>
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/website_event_track_quiz/static/src/js/event_quiz.js"/>
+            <script type="text/javascript" src="/website_event_track_quiz/static/src/js/event_quiz_leaderboard.js"/>
+        </xpath>
+    </template>
+</data></odoo>
diff --git a/addons/website_event_track_quiz/views/event_leaderboard_templates.xml b/addons/website_event_track_quiz/views/event_leaderboard_templates.xml
new file mode 100644
index 00000000000..8e0eda03aba
--- /dev/null
+++ b/addons/website_event_track_quiz/views/event_leaderboard_templates.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+<template id="event_leaderboard" name="Leaderboard">
+    <t t-call="website_event.layout">
+        <div t-if="visitors" class="bg-light pt32 pb32 o_wevent_quiz_leaderboard">
+            <t t-call="website_event_track_quiz.leaderboard_search_bar"/>
+            <div class="container mt32">
+                <div t-if="not search" class="row mb-3">
+                    <div class="col-md-4 d-flex flex-grow-1" t-foreach="top3_visitors" t-as="visitor">
+                        <t t-call="website_event_track_quiz.top3_visitor_card"></t>
+                    </div>
+                </div>
+                <table class="table table-sm">
+                    <tr t-foreach="visitors" t-as="visitor"
+                        t-attf-class="#{'alert-info' if visitor['visitor'] == current_visitor else 'bg-white'} #{'o_wevent_quiz_scroll_to' if scroll_to_position and visitor['visitor'] == current_visitor else ''}">
+                        <t t-call="website_event_track_quiz.all_visitor_card"/>
+                    </tr>
+                </table>
+                <div class="form-inline justify-content-center">
+                    <t t-call="website_event_track_quiz.pager_nobox"/>
+                </div>
+            </div>
+        </div>
+        <div t-if="not visitors and search" class="container mt32">
+            <t t-call="website_event_track_quiz.leaderboard_search_bar"/>
+            <div class='alert alert-warning mt32'>No user found for <strong><t t-esc="search"/></strong>. Try another search.</div>
+        </div>
+        <div t-if="not visitors and not search" class="vh-100 bg-light d-flex justify-content-center align-items-center">
+            <h4 class="text-muted font-weight-bold">There is currently no leaderboard available</h4>
+        </div>
+    </t>
+</template>
+
+<template id="pager_nobox" name="Pager (not box display)">
+    <ul t-if="pager['page_count'] > 1" t-attf-class="o_wprofile_pager font-weight-bold pagination m-0">
+        <li t-attf-class="page-item o_wprofile_pager_arrow #{'disabled' if pager['page']['num'] == 1 else ''}">
+            <a t-att-href=" pager['page_first']['url'] if pager['page']['num'] != 1 else None" class="page-link"><i class="fa fa-step-backward"/></a>
+        </li>
+        <li t-attf-class="page-item o_wprofile_pager_arrow #{'disabled' if pager['page']['num'] == 1 else ''}">
+            <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else None" class="page-link"><i class="fa fa-caret-left"/></a>
+        </li>
+        <t t-foreach="pager['pages']" t-as="page">
+            <li t-attf-class="page-item #{'active disabled bg-primary rounded-circle' if page['num'] == pager['page']['num'] else ''}"> <a t-att-href="page['url']" class="page-link" t-raw="page['num']"></a></li>
+        </t>
+        <li t-attf-class="page-item o_wprofile_pager_arrow #{'disabled' if pager['page']['num'] == pager['page_count'] else ''}">
+            <a t-att-href="pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else None" class="page-link"><i class="fa fa-caret-right"/></a>
+        </li>
+        <li t-attf-class="page-item o_wprofile_pager_arrow #{'disabled' if pager['page']['num'] == pager['page_count'] else ''}">
+            <a t-att-href=" pager['page_last']['url'] if pager['page']['num'] != pager['page_count'] else None" class="page-link"><i class="fa fa-step-forward"/></a>
+        </li>
+    </ul>
+</template>
+
+<template id="top3_visitor_card" name="Top 3 Visitor Card">
+    <div class="card w-100 text-center mb-2 border-bottom-0">
+        <div class="card-body">
+            <div class="d-inline-block position-relative">
+                <img class="rounded-circle img-fluid"
+                    style="width: 128px; height: 128px; object-fit: cover;"
+                    t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/src/img/user_placeholder.jpg'"/>
+                <img class="position-absolute" t-attf-src="/website_profile/static/src/img/rank_#{visitor['position']}.svg" alt="User rank" style="bottom: 0; right: -10px"/>
+            </div>
+            <h3 class="mt-2 mb-0" t-esc="visitor['visitor'].display_name"></h3>
+        </div>
+        <div class="row mx-0 o_wprofile_top3_card_footer text-nowrap">
+            <div class="col py-3"><b t-esc="visitor['points']"/> <span class="text-muted">Points</span></div>
+        </div>
+    </div>
+</template>
+
+<template id="all_visitor_card" name="All VIsitor Card">
+    <td class="align-middle text-right text-muted" style="width: 0">
+        <span t-esc="visitor['position']"/>
+    </td>
+    <td class="align-middle d-none d-sm-table-cell">
+        <img class="o_object_fit_cover rounded-circle o_wprofile_img_small"
+        width="30"
+        height="30"
+        t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/src/img/user_placeholder.jpg'"/>
+    </td>
+    <td class="align-middle w-md-75">
+        <span class="font-weight-bold" t-esc="visitor['visitor'].display_name"/><br/>
+    </td>
+    <td class="align-middle font-weight-bold text-right text-nowrap">
+        <b t-esc="visitor['points']"/> <span class="text-muted small font-weight-bold">Points</span>
+    </td>
+</template>
+
+<!-- Sub nav -->
+<template id="leaderboard_search_bar" name="Leaderboard search bar">
+    <div class="container">
+        <div class="row align-items-center justify-content-between">
+            <!-- Desktop Mode -->
+            <div class="col d-none d-md-flex flex-row align-items-center justify-content-end">
+                <!-- search -->
+                <form t-attf-action="#{'/event/%s/community/leaderboard/results' % (slug(event))}" role="search" method="get">
+                    <div class="input-group ml-1 position-relative">
+                        <span class="input-group-prepend">
+                            <button class="btn btn-link text-white rounded-0 pr-1" type="submit" aria-label="Search" title="Search">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        </span>
+                        <input type="text" class="form-control rounded-0" name="search" placeholder="Search Attendees" t-att-value="searched_name or ''"/>
+                    </div>
+                </form>
+            </div>
+
+            <!-- Mobile Mode -->
+            <div class="col d-md-none py-1 o_wprofile_user_profile_sub_nav_mobile_col">
+                <div class="btn-group w-100 position-relative" role="group" aria-label="Mobile sub-nav">
+
+                    <div class="btn-group ml-1 position-static mr-2">
+                        <a class="btn bg-black-25 text-white dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-search"></i></a>
+                        <div class="dropdown-menu dropdown-menu-right w-100" style="right: 10px;">
+                            <form class="px-3" t-attf-action="#{'/event/%s/community/leaderboard' % (slug(event))}" role="search" method="get">
+                                <div class="input-group">
+                                    <input type="text" class="form-control" name="search" placeholder="Search courses"/>
+                                    <span class="input-group-append">
+                                        <button class="btn btn-primary" type="submit" aria-label="Search" title="Search">
+                                            <i class="fa fa-search"/>
+                                        </button>
+                                    </span>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+</odoo>
diff --git a/addons/website_event_track_quiz/views/event_menus.xml b/addons/website_event_track_quiz/views/event_menus.xml
new file mode 100644
index 00000000000..3fec856dd32
--- /dev/null
+++ b/addons/website_event_track_quiz/views/event_menus.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <menuitem id="event_quiz_menu"
+        name="Quizzes"
+        action="event_quiz_action"
+        parent="event.menu_event_configuration"
+        groups="base.group_no_one"
+        sequence="50"/>
+    <menuitem id="event_quiz_question_menu"
+        name="Quiz Questions"
+        action="event_quiz_question_action"
+        parent="event.menu_event_configuration"
+        groups="base.group_no_one"
+        sequence="55"/>
+
+</data></odoo>
diff --git a/addons/website_event_track_quiz/views/event_quiz_question_views.xml b/addons/website_event_track_quiz/views/event_quiz_question_views.xml
new file mode 100644
index 00000000000..f9c8ba0b621
--- /dev/null
+++ b/addons/website_event_track_quiz/views/event_quiz_question_views.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="event_quiz_question_view_search" model="ir.ui.view">
+        <field name="name">event.quiz.question.view.search</field>
+        <field name="model">event.quiz.question</field>
+        <field name="arch" type="xml">
+            <search string="Quiz Questions">
+                <field name="name"/>
+                <field name="quiz_id"/>
+                <group string="Group By" expand="0">
+                    <filter string="Quiz" name="groupby_quiz_id" context="{'group_by': 'quiz_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="event_quiz_question_view_tree" model="ir.ui.view">
+        <field name="name">event.quiz.question.view.tree</field>
+        <field name="model">event.quiz.question</field>
+        <field name="arch" type="xml">
+            <tree string="Quiz Questions">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>
+                <field name="quiz_id"/>
+                <field name="awarded_points"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="event_quiz_question_view_tree_from_quiz" model="ir.ui.view">
+        <field name="name">event.quiz.question.view.tree.from.quiz</field>
+        <field name="model">event.quiz.question</field>
+        <field name="inherit_id" ref="website_event_track_quiz.event_quiz_question_view_tree"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='quiz_id']" position="replace">
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_quiz_question_view_form" model="ir.ui.view">
+        <field name="name">event.quiz.question.view.form</field>
+        <field name="model">event.quiz.question</field>
+        <field name="arch" type="xml">
+            <form string="Quiz Question">
+                <sheet>
+                    <h1>
+                        <field name="name" default_focus="1"
+                            placeholder="e.g. According to Douglas, what should you pay most attention to?"/>
+                    </h1>
+                    <group>
+                        <field name="quiz_id"/>
+                        <field name="awarded_points" invisible="1"/>
+                    </group>
+                    <group name="questions">
+                        <field name="answer_ids" nolabel="1">
+                            <tree editable="bottom" create="true" delete="true">
+                                <field name="sequence" widget="handle"/>
+                                <field name="text_value"/>
+                                <field name="awarded_points"/>
+                                <field name="comment"/>
+                            </tree>
+                        </field>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="event_quiz_question_view_form_from_quiz" model="ir.ui.view">
+        <field name="name">event.quiz.question.view.form.from.quiz</field>
+        <field name="model">event.quiz.question</field>
+        <field name="inherit_id" ref="website_event_track_quiz.event_quiz_question_view_form"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='quiz_id']" position="replace">
+            </xpath>
+        </field>
+    </record>
+
+    <record id="event_quiz_question_action" model="ir.actions.act_window">
+        <field name="name">Event Quiz Questions</field>
+        <field name="res_model">event.quiz.question</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+              Create a Question
+            </p>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_event_track_quiz/views/event_quiz_templates.xml b/addons/website_event_track_quiz/views/event_quiz_templates.xml
new file mode 100644
index 00000000000..1d8fd726bef
--- /dev/null
+++ b/addons/website_event_track_quiz/views/event_quiz_templates.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <template id="quiz_content" name="Track: Quiz specific content">
+        <t t-set="quiz_completed" t-value="quiz_completed or False"/>
+
+        <div class="o_quiz_js_quiz col"
+            t-att-data-id="track.id"
+            t-att-data-event-id="track.event_id.id"
+            t-att-data-completed="1 if quiz_completed else 0"
+            t-att-data-quiz-attempts-count="quiz_attempts_count or 0"
+            t-att-data-quiz-points-gained="quiz_points"
+            t-att-data-is-manager="user_event_manager or 0">
+            <t t-foreach="track.quiz_id.question_ids" t-as="question">
+                <t t-call="website_event_track_quiz.quiz_question"/>
+            </t>
+            <div class="o_quiz_js_quiz_validation pt-3"/>
+        </div>
+    </template>
+
+    <template id="quiz_question" name="Quiz question template">
+        <div t-att-class="'o_quiz_js_quiz_question mt-3 %s' % ('completed-disabled' if quiz_completed else '')"
+            t-att-data-question-id="question['id']" t-att-data-title="question['name']" >
+            <div class="row d-flex mb-2 mx-0">
+                <div class="h4">
+                    <span t-esc="question['name']"/>
+                </div>
+            </div>
+            <div class="list-group">
+                <t t-foreach="question['answer_ids']" t-as="answer">
+                    <a t-att-data-answer-id="answer['id']" href="#"
+                        t-att-data-text="answer['text_value']" t-att-data-is-correct="answer['is_correct']" t-att-data-comment="answer['comment']"
+                        t-att-class="'o_quiz_quiz_answer list-group-item list-group-item-action d-flex align-items-center %s' % ('list-group-item-success' if slid_completed and answer['is_correct'] else '')">
+                        <label class="my-0 d-flex align-items-center justify-content-center mr-2">
+                            <input type="radio"
+                                t-att-name="question['id']"
+                                t-att-value="answer['id']"
+                                class="d-none"
+                                t-att-disabled="quiz_completed"/>
+                            <i t-att-class="'fa fa-circle text-400 %s' % ('d-none' if quiz_completed and answer['is_correct'] else '')"/>
+                            <i class="fa fa-times-circle text-danger d-none"></i>
+                            <i t-att-class="'fa fa-check-circle text-success %s' % ('d-none' if not (quiz_completed and answer['is_correct']) else '')"></i>
+                        </label>
+                        <span t-esc="answer['text_value']"/>
+                    </a>
+                </t>
+                <div class="o_quiz_quiz_answer_info list-group-item list-group-item-info d-none">
+                    <i class="fa fa-info-circle"/>
+                    <span class="o_quiz_quiz_answer_comment"/>
+                </div>
+            </div>
+        </div>
+    </template>
+</odoo>
diff --git a/addons/website_event_track_quiz/views/event_quiz_views.xml b/addons/website_event_track_quiz/views/event_quiz_views.xml
new file mode 100644
index 00000000000..a7a528a55d6
--- /dev/null
+++ b/addons/website_event_track_quiz/views/event_quiz_views.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="event_quiz_view_search" model="ir.ui.view">
+        <field name="name">event.quiz.view.search</field>
+        <field name="model">event.quiz</field>
+        <field name="arch" type="xml">
+            <search string="Quizzes">
+                <field name="name"/>
+                <field name="event_track_id"/>
+                <field name="event_id"/>
+                <group string="Group By" expand="0">
+                    <filter string="Track" name="groupby_event_track_id" context="{'group_by': 'event_track_id'}"/>
+                    <filter string="Event" name="groupby_event_id" context="{'group_by': 'event_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="event_quiz_view_tree" model="ir.ui.view">
+        <field name="name">event.quiz.view.tree</field>
+        <field name="model">event.quiz</field>
+        <field name="arch" type="xml">
+            <tree string="Quizzes">
+                <field name="name"/>
+                <field name="event_id"/>
+                <field name="event_track_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="event_quiz_view_form" model="ir.ui.view">
+        <field name="name">event.quiz.view.form</field>
+        <field name="model">event.quiz</field>
+        <field name="arch" type="xml">
+            <form string="Quiz">
+                <sheet>
+                    <h1>
+                        <field name="name" default_focus="1"
+                            placeholder="e.g. Test your Knowledge"/>
+                    </h1>
+                    <group>
+                        <field name="event_track_id"/>
+                        <field name="event_id"/>
+                    </group>
+                    <group name="questions" string="Questions">
+                        <field name="question_ids" nolabel="1"
+                            context="{
+                                'tree_view_ref': 'website_event_track_quiz.event_quiz_question_view_tree_from_quiz',
+                                'form_view_ref': 'website_event_track_quiz.event_quiz_question_view_form_from_quiz'
+                            }"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="event_quiz_view_form_from_track" model="ir.ui.view">
+        <field name="name">event.quiz.view.form</field>
+        <field name="model">event.quiz</field>
+        <field name="inherit_id" ref="website_event_track_quiz.event_quiz_view_form"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='event_track_id']" position="replace"></xpath>
+            <xpath expr="//field[@name='event_id']" position="replace"></xpath>
+        </field>
+    </record>
+
+    <record id="event_quiz_action" model="ir.actions.act_window">
+        <field name="name">Event Quizzes</field>
+        <field name="res_model">event.quiz</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+              Create a Quiz
+            </p>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_event_track_quiz/views/event_track_templates_page.xml b/addons/website_event_track_quiz/views/event_track_templates_page.xml
new file mode 100644
index 00000000000..e448cfd35dc
--- /dev/null
+++ b/addons/website_event_track_quiz/views/event_track_templates_page.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_track_content"
+    name="Track: Main Description: add quiz"
+    inherit_id="website_event_track_session.event_track_content">
+    <xpath expr="//div[hasclass('o_wesession_track_main_description')]" position="after">
+        <div id="we_track_quiz_container" t-if="track.quiz_id"
+             t-att-class="'o_quiz_js_quiz_container o_quiz_main border-top bg-white px-2 pt-4 pb-4 col-12 %s' % ('' if track.is_quiz_completed else 'd-none')"
+             t-att-data-object-id="track.id">
+            <h3 class="col-12">Quiz</h3>
+            <t t-call="website_event_track_quiz.quiz_content">
+                <t t-set="track" t-value="track"/>
+                <t t-set="quiz_completed" t-value="track.is_quiz_completed"/>
+                <t t-set="quiz_points" t-value="track.quiz_points"/>
+            </t>
+        </div>
+    </xpath>
+    <xpath expr="//div[hasclass('o_we_track_reminder_button')]" position="before">
+        <div class="o_we_track_quiz_button mr-2 my-1" t-if="track.quiz_id and not track.is_quiz_completed and not track.is_track_upcoming">
+            <a class="btn btn-primary" href="#we_track_quiz_container" onclick="$('.o_quiz_js_quiz_container').removeClass('d-none'); ">
+                Take the Quiz
+            </a>
+        </div>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_quiz/views/event_track_views.xml b/addons/website_event_track_quiz/views/event_track_views.xml
new file mode 100644
index 00000000000..d8d2f190735
--- /dev/null
+++ b/addons/website_event_track_quiz/views/event_track_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="event_track_view_form" model="ir.ui.view" >
+        <field name="name">event.track.view.form.inherit.event.track.quiz</field>
+        <field name="model">event.track</field>
+        <field name="inherit_id" ref="website_event_track_session.event_track_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='event_track_cta_group']" position="after">
+                <group name="event_track_quiz_group">
+                    <field name="quiz_id"
+                        context="{'form_view_ref': 'website_event_track_quiz.event_quiz_view_form_from_track'}"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_event_track_quiz/views/event_type_views.xml b/addons/website_event_track_quiz/views/event_type_views.xml
new file mode 100644
index 00000000000..2fe00f48acf
--- /dev/null
+++ b/addons/website_event_track_quiz/views/event_type_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<odoo><data>
+    <record id="event_type_view_form" model="ir.ui.view">
+        <field name="name">event.type.view.form.inherit.meet</field>
+        <field name="model">event.type</field>
+        <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='community-menu']" position="attributes">
+                <attribute name="groups"></attribute>
+            </xpath>
+        </field>
+    </record>
+</data></odoo>
diff --git a/addons/website_event_track_session/__init__.py b/addons/website_event_track_session/__init__.py
new file mode 100644
index 00000000000..5a31f331a2a
--- /dev/null
+++ b/addons/website_event_track_session/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
+from . import models
+from . import tests
diff --git a/addons/website_event_track_session/__manifest__.py b/addons/website_event_track_session/__manifest__.py
new file mode 100644
index 00000000000..f9e3b627e0c
--- /dev/null
+++ b/addons/website_event_track_session/__manifest__.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    'name': 'Event Live Sessions',
+    'category': 'Marketing/Events',
+    'sequence': 1005,
+    'version': '1.0',
+    'summary': 'Event: live session on tracks',
+    'website': 'https://www.odoo.com/page/events',
+    'description': "",
+    'depends': [
+        'website_event_track_online',
+    ],
+    'data': [
+        'views/assets.xml',
+        'views/event_track_templates_agenda.xml',
+        'views/event_track_templates_list.xml',
+        'views/event_track_templates_misc.xml',
+        'views/event_track_templates_page.xml',
+        'views/event_track_views.xml',
+    ],
+    'demo': [
+        'data/event_track_demo.xml',
+    ],
+    'application': False,
+    'installable': True,
+}
diff --git a/addons/website_event_track_session/controllers/__init__.py b/addons/website_event_track_session/controllers/__init__.py
new file mode 100644
index 00000000000..1c2ee57c54f
--- /dev/null
+++ b/addons/website_event_track_session/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import session
diff --git a/addons/website_event_track_session/controllers/session.py b/addons/website_event_track_session/controllers/session.py
new file mode 100644
index 00000000000..8ac27f82eab
--- /dev/null
+++ b/addons/website_event_track_session/controllers/session.py
@@ -0,0 +1,200 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from ast import literal_eval
+from pytz import timezone, utc
+from werkzeug.exceptions import Forbidden, NotFound
+
+from odoo import exceptions, fields, http
+from odoo.addons.website_event_track_online.controllers.event_track import EventTrackOnlineController
+from odoo.http import request
+from odoo.osv import expression
+from odoo.tools import is_html_empty
+
+
+class WebsiteEventSessionController(EventTrackOnlineController):
+
+    def _get_event_tracks_base_domain(self, event):
+        """ Base domain for displaying tracks. Restrict to accepted or published
+        tracks for people not managing events. Unpublished tracks may be displayed
+        but not reachable for teasing purpose. """
+        search_domain_base = [
+            ('event_id', '=', event.id),
+            ('date', '!=', False)
+        ]
+        if not request.env.user.has_group('event.group_event_user'):
+            search_domain_base = expression.AND([
+                search_domain_base,
+                ['|', ('is_published', '=', True), ('is_accepted', '=', True)]
+            ])
+        return search_domain_base
+
+    # ------------------------------------------------------------
+    # MAIN PAGE
+    # ------------------------------------------------------------
+
+    @http.route([
+        '''/event/<model("event.event"):event>/track''',
+        '''/event/<model("event.event"):event>/track/tag/<model("event.track.tag"):tag>'''
+    ], type='http', auth="public", website=True, sitemap=False)
+    def event_tracks(self, event, tag=None, **searches):
+        """ Main route
+
+        :param event: event whose tracks are about to be displayed;
+        :param tag: deprecated: search for a specific tag
+        :param searches: frontend search dict, containing
+
+          * 'search': search string;
+          * 'tags': list of tag IDs for filtering;
+        """
+        if not event.can_access_from_current_website():
+            raise NotFound()
+
+        return request.render(
+            "website_event_track.tracks",
+            self._event_tracks_get_values(event, tag=tag, **searches)
+        )
+
+    def _event_tracks_get_values(self, event, tag=None, **searches):
+        # init and process search terms
+        searches.setdefault('search', '')
+        searches.setdefault('search_wishlist', '')
+        searches.setdefault('tags', '')
+        search_domain = self._get_event_tracks_base_domain(event)
+
+        # search on content
+        if searches.get('search'):
+            search_domain = expression.AND([
+                search_domain,
+                [('name', 'ilike', searches['search'])]
+            ])
+
+        # search on tags
+        search_tags = self._get_search_tags(searches['tags'])
+        if not search_tags and tag:  # backward compatibility
+            search_tags = tag
+        if search_tags:
+            # Example: You filter on age: 10-12 and activity: football.
+            # Doing it this way allows to only get events who are tagged "age: 10-12" AND "activity: football".
+            # Add another tag "age: 12-15" to the search and it would fetch the ones who are tagged:
+            # ("age: 10-12" OR "age: 12-15") AND "activity: football
+            grouped_tags = dict()
+            for search_tag in search_tags:
+                grouped_tags.setdefault(search_tag.category_id, list()).append(search_tag)
+            search_domain_items = [
+                [('tag_ids', 'in', [tag.id for tag in grouped_tags[group]])]
+                for group in grouped_tags
+            ]
+            search_domain = expression.AND([
+                search_domain,
+                *search_domain_items
+            ])
+
+        # fetch data to display with TZ set for both event and tracks
+        now_tz = utc.localize(fields.Datetime.now().replace(microsecond=0), is_dst=False).astimezone(timezone(event.date_tz))
+        today_tz = now_tz.date()
+        event = event.with_context(tz=event.date_tz or 'UTC')
+        tracks_sudo = event.env['event.track'].sudo().search(search_domain, order='date asc')
+        tag_categories = request.env['event.track.tag.category'].sudo().search([])
+
+        # filter on wishlist (as post processing due to costly search on is_reminder_on)
+        if searches.get('search_wishlist'):
+            tracks_sudo = tracks_sudo.filtered(lambda track: track.is_reminder_on)
+
+        # organize categories for display: live, soon and day-based
+        date_begin_tz_all = list(set(
+            dt.date()
+            for dt in self._get_dt_in_event_tz(tracks_sudo.mapped('date'), event)
+        ))
+        date_begin_tz_all.sort()
+        tracks_sudo_live = tracks_sudo.filtered(lambda track: track.is_published and track.is_track_live)
+        tracks_sudo_soon = tracks_sudo.filtered(lambda track: track.is_published and not track.is_track_live and track.is_track_soon)
+        tracks_by_day = []
+        for display_date in date_begin_tz_all:
+            matching_track = tracks_sudo.filtered(lambda track: self._get_dt_in_event_tz([track.date], event)[0].date() == display_date)
+            tracks_by_day.append((display_date, matching_track))
+
+        # return rendering values
+        return {
+            # event information
+            'event': event,
+            'main_object': event,
+            # tracks display information
+            'tracks': tracks_sudo,
+            'tracks_by_day': tracks_by_day,
+            'tracks_live': tracks_sudo_live,
+            'tracks_soon': tracks_sudo_soon,
+            'today_tz': today_tz,
+            # search information
+            'searches': searches,
+            'search_key': searches['search'],
+            'search_wishlist': searches['search_wishlist'],
+            'search_tags': search_tags,
+            'tag_categories': tag_categories,
+            # environment
+            'is_html_empty': is_html_empty,
+            'hostname': request.httprequest.host.split(':')[0],
+            'user_event_manager': request.env.user.has_group('event.group_event_manager'),
+        }
+
+    # ------------------------------------------------------------
+    # PAGE VIEW
+    # ------------------------------------------------------------
+
+    @http.route('/event/<model("event.event"):event>/track/<model("event.track"):track>',
+                type='http', auth="public", website=True, sitemap=False)
+    def event_track_page(self, event, track, **options):
+        track = self._fetch_track(track.id, allow_is_accepted=False)
+
+        return request.render(
+            "website_event_track_session.event_track_main",
+            self._event_track_page_get_values(event, track.sudo(), **options)
+        )
+
+    def _event_track_page_get_values(self, event, track, **options):
+        track = track.sudo()
+
+        option_widescreen = options.get('widescreen', False)
+        option_widescreen = bool(option_widescreen) if option_widescreen != '0' else False
+        # search for tracks list
+        tracks_other = track._get_track_suggestions(
+            restrict_domain=self._get_event_tracks_base_domain(track.event_id),
+            limit=10
+        )
+
+        return {
+            # event information
+            'event': event,
+            'main_object': track,
+            'track': track,
+            # sidebar
+            'tracks_other': tracks_other,
+            # options
+            'option_widescreen': option_widescreen,
+            # environment
+            'is_html_empty': is_html_empty,
+            'hostname': request.httprequest.host.split(':')[0],
+            'user_event_manager': request.env.user.has_group('event.group_event_manager'),
+        }
+
+    # ------------------------------------------------------------
+    # TOOLS
+    # ------------------------------------------------------------
+
+    def _get_search_tags(self, tag_search):
+        # TDE FIXME: make me generic (slides, event, ...)
+        try:
+            tag_ids = literal_eval(tag_search)
+        except Exception:
+            tags = request.env['event.track.tag'].sudo()
+        else:
+            # perform a search to filter on existing / valid tags implicitly
+            tags = request.env['event.track.tag'].sudo().search([('id', 'in', tag_ids)])
+        return tags
+
+    def _get_dt_in_event_tz(self, datetimes, event):
+        tz_name = event.date_tz
+        return [
+            utc.localize(dt, is_dst=False).astimezone(timezone(tz_name))
+            for dt in datetimes
+        ]
diff --git a/addons/website_event_track_session/data/event_track_demo.xml b/addons/website_event_track_session/data/event_track_demo.xml
new file mode 100644
index 00000000000..c9fd08ccd84
--- /dev/null
+++ b/addons/website_event_track_session/data/event_track_demo.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <record id="website_event_track.event_7_track_1" model="event.track">
+        <field name="website_cta" eval="True"/>
+        <field name="website_cta_title">Try Now</field>
+        <field name="website_cta_url">http://www.example.com</field>
+        <field name="website_cta_delay">10</field>
+    </record>
+    <record id="website_event_track.event_7_track_4" model="event.track">
+        <field name="website_cta" eval="True"/>
+        <field name="website_cta_title">Try Now</field>
+        <field name="website_cta_url">http://www.example.com</field>
+        <field name="website_cta_delay">10</field>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_session/models/__init__.py b/addons/website_event_track_session/models/__init__.py
new file mode 100644
index 00000000000..e3798014924
--- /dev/null
+++ b/addons/website_event_track_session/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import event_track
diff --git a/addons/website_event_track_session/models/event_track.py b/addons/website_event_track_session/models/event_track.py
new file mode 100644
index 00000000000..0b20937a7f9
--- /dev/null
+++ b/addons/website_event_track_session/models/event_track.py
@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from datetime import timedelta
+from random import randint
+from pytz import utc
+
+from odoo import api, fields, models
+from odoo.osv import expression
+
+
+class EventTrack(models.Model):
+    _inherit = "event.track"
+
+    # Call to action
+    website_cta = fields.Boolean('Magic Button')
+    website_cta_title = fields.Char('Button Title')
+    website_cta_url = fields.Char('Button Target URL')
+    website_cta_delay = fields.Integer('Button appears')
+    # time information for track
+    is_track_live = fields.Boolean(
+        'Is Track Live', compute='_compute_track_time_data',
+        help="Track has started and is ongoing")
+    is_track_soon = fields.Boolean(
+        'Is Track Soon', compute='_compute_track_time_data',
+        help="Track begins soon")
+    is_track_today = fields.Boolean(
+        'Is Track Today', compute='_compute_track_time_data',
+        help="Track begins today")
+    is_track_upcoming = fields.Boolean(
+        'Is Track Upcoming', compute='_compute_track_time_data',
+        help="Track is not yet started")
+    is_track_done = fields.Boolean(
+        'Is Track Done', compute='_compute_track_time_data',
+        help="Track is finished")
+    track_start_remaining = fields.Integer(
+        'Minutes before track starts', compute='_compute_track_time_data',
+        help="Remaining time before track starts (seconds)")
+    track_start_relative = fields.Integer(
+        'Minutes compare to track start', compute='_compute_track_time_data',
+        help="Relative time compared to track start (seconds)")
+    # time information for CTA
+    is_website_cta_live = fields.Boolean(
+        'Is CTA Live', compute='_compute_cta_time_data',
+        help="CTA button is available")
+    website_cta_start_remaining = fields.Integer(
+        'Minutes before CTA starts', compute='_compute_cta_time_data',
+        help="Remaining time before CTA starts (seconds)")
+
+    @api.depends('date', 'date_end')
+    def _compute_track_time_data(self):
+        """ Compute start and remaining time for track itself. Do everything in
+        UTC as we compute only time deltas here. """
+        now_utc = utc.localize(fields.Datetime.now().replace(microsecond=0))
+        for track in self:
+            if not track.date:
+                track.is_track_live = track.is_track_soon = track.is_track_today = track.is_track_upcoming = track.is_track_done = False
+                track.track_start_relative = track.track_start_remaining = 0
+                continue
+            date_begin_utc = utc.localize(track.date, is_dst=False)
+            date_end_utc = utc.localize(track.date_end, is_dst=False)
+            track.is_track_live = date_begin_utc <= now_utc < date_end_utc
+            track.is_track_soon = (date_begin_utc - now_utc).total_seconds() < 30*60 if date_begin_utc > now_utc else False
+            track.is_track_today = date_begin_utc.date() == now_utc.date()
+            track.is_track_upcoming = date_begin_utc > now_utc
+            track.is_track_done = date_end_utc <= now_utc
+            if date_begin_utc >= now_utc:
+                track.track_start_relative = int((date_begin_utc - now_utc).total_seconds())
+                track.track_start_remaining = track.track_start_relative
+            else:
+                track.track_start_relative = int((now_utc - date_begin_utc).total_seconds())
+                track.track_start_remaining = 0
+
+    @api.depends('date', 'date_end', 'website_cta', 'website_cta_delay')
+    def _compute_cta_time_data(self):
+        """ Compute start and remaining time for track itself. Do everything in
+        UTC as we compute only time deltas here. """
+        now_utc = utc.localize(fields.Datetime.now().replace(microsecond=0))
+        for track in self:
+            if not track.website_cta:
+                track.is_website_cta_live = track.website_cta_start_remaining = False
+                continue
+
+            date_begin_utc = utc.localize(track.date, is_dst=False) + timedelta(minutes=track.website_cta_delay or 0)
+            date_end_utc = utc.localize(track.date_end, is_dst=False)
+            track.is_website_cta_live = date_begin_utc <= now_utc <= date_end_utc
+            if date_begin_utc >= now_utc:
+                td = date_begin_utc - now_utc
+                track.website_cta_start_remaining = int(td.total_seconds())
+            else:
+                track.website_cta_start_remaining = 0
+
+    def _get_track_suggestions(self, restrict_domain=None, limit=None):
+        """ Returns the next tracks suggested after going to the current one
+        given by self. Tracks always belong to the same event.
+
+        Heuristic is
+
+          * live first;
+          * then ordered by start date, finished being sent to the end;
+          * wishlisted (manually or by default);
+          * tag matching with current track;
+          * location matching with current track;
+          * finally a random to have an "equivalent wave" randomly given;
+
+        :param restrict_domain: an additional domain to restrict candidates;
+        :param limit: number of tracks to return;
+        """
+        self.ensure_one()
+
+        base_domain = [
+            '&',
+            ('event_id', '=', self.event_id.id),
+            ('id', '!=', self.id),
+        ]
+        if restrict_domain:
+            base_domain = expression.AND([
+                base_domain,
+                restrict_domain
+            ])
+
+        track_candidates = self.search(base_domain, limit=None, order='date asc')
+        if not track_candidates:
+            return track_candidates
+
+        track_candidates = track_candidates.sorted(
+            lambda track:
+                (track.is_published,
+                 track.is_track_live,
+                 track.track_start_remaining > 0,
+                 -1 * track.track_start_remaining,
+                 track.is_reminder_on,
+                 not track.wishlisted_by_default,
+                 len(track.tag_ids & self.tag_ids),
+                 track.location_id == self.location_id,
+                 randint(0, 20),
+                ), reverse=True
+        )
+
+        return track_candidates[:limit]
+
+    def get_backend_menu_id(self):
+        return self.env.ref('event.event_main_menu').id
diff --git a/addons/website_event_track_session/static/src/scss/event_track_templates.scss b/addons/website_event_track_session/static/src/scss/event_track_templates.scss
new file mode 100644
index 00000000000..6f2a8352348
--- /dev/null
+++ b/addons/website_event_track_session/static/src/scss/event_track_templates.scss
@@ -0,0 +1,93 @@
+.o_wesession_index {
+
+    /*
+     * COMMON
+     */
+
+    .o_wesession_gradient {
+        background-image: linear-gradient(120deg, #875A7B, darken(#875A7B, 10%));
+        opacity: 0.8;
+    }
+
+    /*
+     * MAIN PAGE: LIST
+     */
+
+    // Tracks list
+    .o_wesession_list_tracks {
+        li {
+            border: 1px solid $border-color;
+        }
+
+        li:not(:first-child) {
+            border-top: 0;
+        }
+    }
+
+    // Track card
+    .o_wesession_track_card {
+        .card-body {
+            padding: 1rem;
+        }
+
+        .card-footer {
+            padding: 0.75rem 1rem;
+        }
+
+        .o_wesession_track_card_header_badge {
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+            padding: $card-spacer-y $card-spacer-x;
+            text-align: right;
+        }
+        &.o_wesession_track_card_unpublished {
+            opacity: 0.8;
+        }
+    }
+
+    /*
+     * TRACK PAGE: VIEW
+     */
+
+    .o_wevent_online_page_container {
+        // Main panel: current track
+        .o_wesession_track_main {
+            // Force side panel min-width to account for potential Youtube chat
+            // And adapt main panel max-width accordingly.
+            @include media-breakpoint-up(xl) {
+                max-width: calc(100% - 22rem);
+            }
+
+            @media screen and (min-width: 1400px) {
+                max-width: none;
+            }
+        }
+
+        // Left panel: other tracks
+        .o_wesession_track_aside {
+            // Force side panel min-width to account for potential Youtube chat
+            @include media-breakpoint-up(xl) {
+                min-width: 22rem;
+            }
+
+            @media screen and (min-width: 1400px) {
+                min-width: auto;
+            }
+
+            // Navigation: keel layout simple
+            .o_wesession_track_aside_nav {
+                .nav-link {
+                    background-color: transparent;
+                    border: 0;
+                    color: $gray-600;
+
+                    &.active {
+                        color: $gray-800;
+                        font-weight: 500;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/addons/website_event_track_session/tests/__init__.py b/addons/website_event_track_session/tests/__init__.py
new file mode 100644
index 00000000000..c4e08033d49
--- /dev/null
+++ b/addons/website_event_track_session/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_track_internals
diff --git a/addons/website_event_track_session/tests/test_track_internals.py b/addons/website_event_track_session/tests/test_track_internals.py
new file mode 100644
index 00000000000..5ebcc48ae8e
--- /dev/null
+++ b/addons/website_event_track_session/tests/test_track_internals.py
@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from datetime import datetime, timedelta
+from unittest.mock import patch
+
+from odoo import fields
+from odoo.addons.website.models.website_visitor import WebsiteVisitor
+from odoo.addons.website_event_track_online.tests.common import TestEventTrackOnlineCommon
+
+
+class TestTrackSuggestions(TestEventTrackOnlineCommon):
+
+    def test_track_suggestion(self):
+        [location_1, location_2] = self.env['event.track.location'].create([
+            {'name': 'Location 1'},
+            {'name': 'Location 2'},
+        ])
+
+        [tag_1, tag_2, tag_3, tag_4] = self.env['event.track.tag'].create([
+            {'name': 'Tag 1'}, {'name': 'Tag 2'}, {'name': 'Tag 3'}, {'name': 'Tag 4'}
+        ])
+
+        date = fields.Datetime.from_string(datetime.now().strftime('%Y-%m-%d %H:00:00'))
+        [track_1, track_2, track_3, track_4, track_5, track_6] = self.env['event.track'].create([{
+            'name': 'Track 1',
+            'location_id': location_1.id,
+            'event_id': self.event_0.id,
+            'tag_ids': [(4, tag_1.id), (4, tag_2.id)],
+            'date': date + timedelta(hours=-1),
+        }, {
+            'name': 'Track 2',
+            'location_id': location_2.id,
+            'event_id': self.event_0.id,
+            'date': date,
+        }, {
+            'name': 'Track 3',
+            'location_id': location_2.id,
+            'event_id': self.event_0.id,
+            'tag_ids': [(4, tag_1.id), (4, tag_3.id), (4, tag_4.id)],
+            'date': date,
+        }, {
+            'name': 'Track 4',
+            'event_id': self.event_0.id,
+            'tag_ids': [(4, tag_1.id), (4, tag_2.id)],
+            'date': date,
+        }, {
+            'name': 'Track 5',
+            'event_id': self.event_0.id,
+            'tag_ids': [(4, tag_1.id), (4, tag_3.id)],
+            'wishlisted_by_default': True,
+            'date': date,
+        }, {
+            'name': 'Track 6',
+            'location_id': location_1.id,
+            'event_id': self.event_0.id,
+            'tag_ids': [(4, tag_1.id), (4, tag_3.id)],
+            'date': date,
+        }])
+
+        emp_visitor = self.env['website.visitor'].create({
+            'name': 'Visitor',
+            'partner_id': self.user_employee.partner_id.id
+        })
+        visitor_track = self.env['event.track.visitor'].create({
+            'visitor_id': emp_visitor.id,
+            'track_id': track_3.id,
+            'is_wishlisted': True,
+        })
+
+        with patch.object(WebsiteVisitor, '_get_visitor_from_request', lambda *args, **kwargs: emp_visitor), \
+                self.with_user('user_employee'):
+            current_track = self.env['event.track'].browse(track_1.id)
+            all_suggestions = current_track._get_track_suggestions()
+            self.assertEqual(
+                all_suggestions.ids,
+                (track_3 + track_5 + track_4 + track_6 + track_2).ids # whlst / wishlst def / tags count / location
+            )
+
+            track_suggestion = current_track._get_track_suggestions(limit=1)
+            self.assertEqual(track_suggestion, track_3,
+                'Returned track should be the manually wishlisted one')
+
+            # remove wishlist, keynote should be top
+            visitor_track.unlink()
+            track_suggestion = current_track._get_track_suggestions(limit=1)
+            self.assertEqual(
+                track_suggestion, track_5,
+                'Returned track should be the default wishlisted one')
+
+            # toggle wishlisted by default off through blacklist
+            track_5_visitor = self.env['event.track.visitor'].sudo().create({
+                'visitor_id': emp_visitor.id,
+                'track_id': track_5.id,
+                'is_blacklisted': True,
+            })
+            track_suggestion = current_track._get_track_suggestions(limit=1)
+            self.assertEqual(
+                track_suggestion, track_4,
+                'Returned track should the one with the most common tags as keynote is blacklisted')
+            track_5_visitor.unlink()
+
+            # remove keynote default, now based on tags
+            track_5.write({'wishlisted_by_default': False})
+            # all_suggestions.invalidate_cache(fnames=['is_reminder_on'])
+            track_suggestion = current_track._get_track_suggestions(limit=1)
+            self.assertEqual(
+                track_suggestion, track_4,
+                'Returned track should the one with the most common tags')
+
+            # remove tags, now based on location
+            all_suggestions.sudo().write({'tag_ids': [(5,)]})
+            track_suggestion = current_track._get_track_suggestions(limit=1)
+            self.assertEqual(
+                track_suggestion, track_6,
+                'Returned track should the one with matching location')
+
+            # remove location, now based o random
+            all_suggestions.sudo().write({'location_id': False})
+            track_suggestion = current_track._get_track_suggestions(limit=1)
+            self.assertTrue(
+                track_suggestion in [track_2, track_3, track_4, track_5, track_6],
+                "Returned track should the a random one (but not the one we're trying to get suggestion for)")
diff --git a/addons/website_event_track_session/views/assets.xml b/addons/website_event_track_session/views/assets.xml
new file mode 100644
index 00000000000..fd9b752732e
--- /dev/null
+++ b/addons/website_event_track_session/views/assets.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Sessions Assets Frontend">
+        <xpath expr="//link[last()]" position="after">
+            <link rel="stylesheet" type="text/scss" href="/website_event_track_session/static/src/scss/event_track_templates.scss"/>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/addons/website_event_track_session/views/event_track_templates_agenda.xml b/addons/website_event_track_session/views/event_track_templates_agenda.xml
new file mode 100644
index 00000000000..1ba3c530ad0
--- /dev/null
+++ b/addons/website_event_track_session/views/event_track_templates_agenda.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="agenda_main_track" name="Track Agenda: Track (Session)"
+    inherit_id="website_event_track_online.agenda_main_track">
+    <xpath expr="//div[hasclass('o_weagenda_track_badges')]/small[1]" position="before">
+        <small t-if="track.is_track_live and not track.is_track_done and track.website_published"
+            class="ml-1 badge badge-danger">Live
+        </small>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_session/views/event_track_templates_list.xml b/addons/website_event_track_session/views/event_track_templates_list.xml
new file mode 100644
index 00000000000..b1a2f9f31fb
--- /dev/null
+++ b/addons/website_event_track_session/views/event_track_templates_list.xml
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="tracks_session"
+    inherit_id="website_event_track.tracks">
+    <!-- New main layout -->
+    <xpath expr="//div[@id='oe_structure_website_event_track_tracks_1']" position="before">
+        <div class="o_wevent_online o_wevent_online_bg o_wesession_index">
+            <!-- Options -->
+            <t t-set="option_track_wishlist" t-value="not event.is_done and request.website.viewref('website_event_track_session.session_topbar_wishlist').active"/>
+            <!-- Topbar -->
+            <t t-call="website_event_track_session.session_topbar"/>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wesession_index_1" class="oe_structure"/>
+            <!-- Content -->
+            <div class="o_wesession_container container">
+                <div class="row">
+                    <t t-call="website_event_track_session.tracks_search"/>
+                </div>
+                <div class="row">
+                    <t t-call="website_event_track_session.tracks_main"/>
+                </div>
+            </div>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wesession_index_2" class="oe_structure"/>
+        </div>
+    </xpath>
+    <!-- Reset existing template as nothing to keep -->
+    <xpath expr="//div[@id='oe_structure_website_event_track_tracks_1']" position="replace"/>
+    <xpath expr="//section" position="replace"/>
+    <xpath expr="//div[@id='oe_structure_website_event_track_tracks_2']" position="replace"/>
+</template>
+
+<!-- ============================================================ -->
+<!-- TOPBAR: BASE NAVIGATION -->
+<!-- ============================================================ -->
+
+<!-- Main topbar -->
+<template id="session_topbar" name="Tracks Tools">
+    <nav class="navbar navbar-light border-top shadow-sm d-print-none">
+        <div class="container">
+            <div class="d-flex flex-column flex-sm-row justify-content-between w-100">
+                <ul class="o_wesession_topbar_filters o_wevent_index_topbar_filters nav">
+                    <!-- Optional wishlist filter -->
+                    <li t-if="option_track_wishlist" class="nav-item dropdown mr-2 my-1">
+                        <a href="#" role="button" class="btn dropdown-toggle" data-toggle="dropdown">
+                            <i class="fa fa-folder-open"/> Wishlist
+                        </a>
+                        <div class="dropdown-menu">
+                            <a t-att-href="'/event/%s/track?%s' % (
+                                    slug(event),
+                                    keep_query('*', search_wishlist='')
+                                )"
+                                class="dropdown-item d-flex align-items-center justify-content-between">
+                                All Talks
+                            </a>
+                            <a t-att-href="'/event/%s/track?%s' % (
+                                    slug(event),
+                                    keep_query('*', search_wishlist='1')
+                                )"
+                                t-attf-class="dropdown-item d-flex align-items-center justify-content-between #{'active' if search_wishlist else ''}">
+                                Wishlisted
+                            </a>
+                        </div>
+                    </li>
+                </ul>
+                <div class="d-flex align-items-center flex-wrap pl-sm-3 pr-0">
+                    <t t-call="website_event.events_search_box">
+                        <t t-set="_searches" t-value="searches"/>
+                        <t t-set="action" t-value="'/event/%s/track' % (slug(event))"/>
+                        <t t-set="_placeholder" t-value="'Search a talk ...'"/>
+                    </t>
+                </div>
+            </div>
+        </div>
+    </nav>
+</template>
+
+<!-- Option: Topbar: optional tags filters -->
+<template id="session_topbar_tag"
+    inherit_id="website_event_track_session.session_topbar"
+    name="Filter by Tags"
+    active="True"
+    customize_show="True">
+    <xpath expr="//ul[hasclass('o_wesession_topbar_filters')]" position="inside">
+        <t t-foreach="tag_categories" t-as="tag_category">
+            <li t-if="tag_category.tag_ids" class="nav-item dropdown mr-2 my-1">
+                <a href="#" role="button" class="btn dropdown-toggle" data-toggle="dropdown">
+                    <i class="fa fa-folder-open"/>
+                    <t t-esc="tag_category.name"/>
+                </a>
+                <div class="dropdown-menu">
+                    <t t-foreach="tag_category.tag_ids" t-as="tag">
+                        <a t-att-href="'/event/%s/track?%s' % (
+                                slug(event),
+                                keep_query('*', tags=str((search_tags - tag).ids if tag in search_tags else (tag | search_tags).ids))
+                            )"
+                            t-attf-class="dropdown-item d-flex align-items-center justify-content-between #{'active' if tag in search_tags else ''}">
+                            <t t-esc="tag.name"/>
+                        </a>
+                    </t>
+                </div>
+            </li>
+        </t>
+    </xpath>
+</template>
+
+<!-- Option: Tracks display: optional wishlist -->
+<template id="session_topbar_wishlist"
+    inherit_id="website_event_track_session.session_topbar"
+    name="Allow Wishlists"
+    active="True"
+    customize_show="True">
+    <xpath expr="//ul[hasclass('o_wesession_topbar_filters')]" position="inside">
+    </xpath>
+</template>
+
+<!-- ============================================================ -->
+<!-- CONTENT: MAIN TEMPLATES -->
+<!-- ============================================================ -->
+
+<!-- Tracks Main Display -->
+<template id="tracks_main" name="Tracks: Main Display">
+    <!-- No tracks -->
+    <t t-if="not tracks">
+        <div class="col-12">
+            <div class="h2 mb-3">No track found.</div>
+            <div t-if="search_key" class="alert alert-info text-center">
+                <p class="m-0">We did not find any track matching your <strong t-esc="search_key"/> search.</p>
+            </div>
+            <div t-else="" class="alert alert-info text-center" groups="event.group_event_manager">
+                <p class="m-0">Schedule some tracks to get started !</p>
+            </div>
+        </div>
+    </t>
+    <!-- Cards -->
+    <div class="col-12" t-call="website_event_track_session.tracks_display_cards"/>
+    <!-- List -->
+    <div class="col-12" t-call="website_event_track_session.tracks_display_list"/>
+</template>
+
+<!-- Tracks: Cards-based display -->
+<template id="tracks_display_cards" name="Tracks: Cards Display">
+    <div class="row mb-3" t-if="tracks_live">
+        <div class="col-12">
+            <h5 class="m-0 text-danger">Live Now</h5>
+            <hr class="mt-2 pb-1 mb-1"/>
+        </div>
+        <div t-foreach="tracks_live" t-as="track" class="col-md-6 col-lg-3 mb-4">
+            <t t-call="website_event_track_session.tracks_cards_track"/>
+        </div>
+    </div>
+    <div class="row mb-3" t-if="tracks_soon">
+        <div class="col-12">
+            <h5 class="m-0 text-danger">Coming soon ...</h5>
+            <hr class="mt-2 pb-1 mb-1"/>
+        </div>
+        <div t-foreach="tracks_soon" t-as="track" class="col-md-6 col-lg-3 mb-4">
+            <t t-call="website_event_track_session.tracks_cards_track"/>
+        </div>
+    </div>
+</template>
+
+<!-- Tracks: List-based display -->
+<template id="tracks_display_list" name="Tracks: List Display">
+    <div t-if="tracks" class="o_wesession_list mb-3">
+        <ul class="list-unstyled">
+            <li t-foreach="tracks_by_day" t-as="tracks_info"
+                class="mb-5">
+                <t t-set="tracks_date" t-value="tracks_info[0]"/>
+                <t t-set="tracks" t-value="tracks_info[1]"/>
+                <!-- DAY HEADER -->
+                <div class="w-100">
+                    <div class="d-flex">
+                        <span class="h1 m-0 font-weight-bold" t-esc="tracks_date"
+                            t-options="{'widget': 'date', 'format': 'EEEE dd'}"/>
+                        <div class="d-flex flex-column ml-2">
+                            <span class="font-weight-bold" t-esc="tracks_date"
+                                t-options="{'widget': 'date', 'format': 'MMMM'}"/>
+                            <span class="font-weight-bold" t-esc="tracks_date"
+                                t-options="{'widget': 'date', 'format': 'YYYY'}"/>
+                        </div>
+                    </div>
+                    <hr class="mt-2 pb-1 mb-1"/>
+                </div>
+                <!-- DAY TRACKS LIST -->
+                <ul class="list-unstyled mx-3 o_wesession_list_tracks">
+                    <!-- CELLS HEADERS -->
+                    <li class="o_wesession_list_item row bg-white shadow-sm py-2 d-none d-md-flex">
+                        <span t-att-class="'col-md-4' if not event.is_done else 'col-md-5'">Topic</span>
+                        <span t-att-class="'col-md-2' if not event.is_done else 'col-md-3'">Tags</span>
+                        <span t-att-class="'col-md-6' if not event.is_done else 'col-md-4'">
+                            <span class="row">
+                                <span t-att-class="'col-md-4' if not event.is_done else 'col-md-8'">Speaker</span>
+                                <span t-att-class="'col-md-3' if not event.is_done else 'col-md-4'">Duration</span>
+                                <span t-if="not event.is_done" class="col-md-5">
+                                    <t t-if="today_tz &lt;= tracks_date">Starts</t>
+                                    <t t-else=""></t>
+                                </span>
+                            </span>
+                        </span>
+                    </li>
+                    <li t-foreach="tracks" t-as="track"
+                        class="o_wesession_list_item row bg-white-50 py-2">
+                        <span t-att-class="'%s col-12 o_wesession_list_item_topic d-flex align-items-center' % ('col-md-4' if not event.is_done else 'col-md-5')"
+                            name="o_wesession_list_item_topic">
+                            <a t-att-href="track.website_url"
+                                t-if="track.is_published or user_event_manager">
+                                <span t-field="track.name"/>
+                            </a>
+                            <t t-else="">
+                                <span t-field="track.name"/>
+                            </t>
+                            <span t-if="not track.is_published and user_event_manager"
+                                class="badge badge-danger ml-2 o_wevent_online_badge_unpublished">
+                                Unpublished
+                            </span>
+                            <!-- Mobile: display reminder icon near name, not in list to save space -->
+                            <div t-if="option_track_wishlist"
+                                class="d-md-none d-inline ml-auto"
+                                t-call="website_event_track_online.track_widget_reminder">
+                                <t t-set="reminder_light" t-value="True"/>
+                                <t t-set="remidner_small" t-value="True"/>
+                                <t t-set="light_theme" t-value="False"/>
+                            </div>
+                        </span>
+                        <div t-att-class="'%s col-12 mt-2 mt-md-0' % ('col-md-2' if not event.is_done else 'col-md-3')">
+                            <t t-foreach="track.tag_ids" t-as="tag">
+                                <t t-call="website_event_track_session.track_tag_badge_link"/>
+                            </t>
+                        </div>
+                        <div t-att-class="'%s col-12 mt-2 mt-md-0' % ('col-md-6' if not event.is_done else 'col-md-4')"
+                            name="o_wesession_list_item_organization">
+                            <div class="row">
+                                <span t-att-class="'%s col-4' % ('col-md-4' if not event.is_done else 'col-md-8')">
+                                    <span t-esc="track.partner_name"/>
+                                </span>
+                                <span t-att-class="'%s col-5' % ('col-md-3' if not event.is_done else 'col-md-4')"
+                                    t-esc="track.duration"
+                                    t-options="{'widget': 'duration', 'digital': False, 'format': 'short', 'unit': 'hour', 'round': 'minute'}"/>
+                                <span t-if="not event.is_done" 
+                                    class="col-md-5 col-3 d-flex align-items-start justify-content-between">
+                                    <t t-if="today_tz &lt;= tracks_date">
+                                        <span t-if="track.is_track_live and not track.is_track_done"
+                                            class="badge badge-danger">Live</span>
+                                        <span t-elif="not track.is_track_done and track.is_track_soon">
+                                            <span t-esc="track.track_start_remaining"
+                                                t-options="{'widget': 'duration', 'digital': False, 'format': 'narrow',
+                                                            'add_direction': True, 'unit': 'second', 'round': 'minute'}"/>
+                                        </span>
+                                        <span t-elif="not track.is_track_done and not track.is_track_soon"
+                                            t-esc="track.date"
+                                            class=""
+                                            t-options="{'widget': 'datetime', 'time_only': True, 'format': 'short'}"/>
+                                        <span t-else="" class="badge badge-info">Finished</span>
+                                        <div t-if="option_track_wishlist"
+                                            class="d-none d-sm-inline"
+                                            t-call="website_event_track_online.track_widget_reminder">
+                                            <t t-set="reminder_small" t-value="True"/>
+                                        </div>
+                                    </t>
+                                </span>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
+            </li>
+        </ul>
+    </div>
+</template>
+
+<!-- ============================================================ -->
+<!-- TOOL TEMPLATES -->
+<!-- ============================================================ -->
+
+<template id="tracks_cards_track" name="Track Card">
+    <a t-att-href="'/event/%s/track/%s' % (slug(track.event_id), slug(track))" class="text-decoration-none">
+        <article t-att-class="'h-100 card border-0 shadow-sm o_wesession_track_card %s' % ('o_wesession_track_card_unpublished' if not track.is_published else '')"
+            itemscope="itemscope" itemtype="http://schema.org/Event">
+            <div class="h-100 row no-gutters">
+                <header class="overflow-hidden bg-secondary col-12 rounded-top">
+                    <small t-if="not track.is_published" class="o_wesession_track_card_header_badge bg-danger">
+                        <i class="fa fa-ban mr-2"/>Unpublished
+                    </small>
+
+                    <div t-if="track.website_image_url" class="card-img-top"
+                        t-attf-style="padding-top: 50%; background-image: url(#{track.website_image_url}); background-size: cover; background-position:center">
+                        <span t-if="option_track_wishlist and not track.is_track_live" class="position-absolute h3 mt-2 mr-2" style="right: 0; top: 0;">
+                            <t t-call="website_event_track_online.track_widget_reminder">
+                                <t t-set="reminder_light" t-value="True"/>
+                                <t t-set="light_theme" t-value="True"/>
+                            </t>
+                        </span>
+                    </div>
+                    <div t-else="" class="o_wesession_gradient card-img-top position-relative"
+                        style="padding-top: 50%;">
+                        <span t-if="option_track_wishlist" class="position-absolute h3 mt-2 mr-2" style="right: 0; top: 0;">
+                            <t t-call="website_event_track_online.track_widget_reminder">
+                                <t t-set="reminder_light" t-value="True"/>
+                            </t>
+                        </span>
+                        <i class="fa fa-glass fa-2x mx-2 mb-3 position-absolute text-white-75" style="right:0; bottom: 0;"/>
+                    </div>
+                </header>
+                <div class="col-12">
+                    <main class="card-body">
+                        <!-- Title -->
+                        <h5 class="card-title mt-0 mb-0 text-truncate">
+                            <span t-field="track.name" itemprop="name"/>
+                        </h5>
+                        <!-- Tags> -->
+                        <div>
+                            <t t-foreach="track.tag_ids" t-as="tag">
+                                <t t-call="website_event_track_session.track_tag_badge_info"/>
+                            </t>
+                        </div>
+                    </main>
+                </div>
+                <!-- Footer -->
+                <footer class="small align-self-end w-100 card-footer">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <!-- Speaker -->
+                        <span class="text-muted text-truncate" t-field="track.partner_name" itemprop="performer"/>
+                        <!-- Starts -->
+                        <span class="text-muted ml-auto">
+                            <t t-if="track.is_track_upcoming &gt; 0">In
+                                <span class="text-muted ml-auto" t-field="track.track_start_remaining" itemprop="duration"
+                                    t-options="{'widget': 'duration', 'digital': False, 'format': 'short', 'unit': 'second', 'round': 'minute'}"/>
+                            </t>
+                            <t t-else="">
+                                <span class="text-muted ml-auto" t-field="track.track_start_relative" itemprop="duration"
+                                    t-options="{'widget': 'duration', 'digital': False, 'format': 'short', 'unit': 'second', 'round': 'minute'}"/>
+                                ago
+                            </t>
+                        </span>
+                    </div>
+                </footer>
+            </div>
+        </article>
+    </a>
+</template>
+
+<!-- Searched tags -->
+<template id="tracks_search" name="Tracks: search tags">
+    <div class="d-flex align-items-center mb-3">
+        <span t-if="search_wishlist"
+            class="align-items-baseline border d-inline-flex pl-2 mt-3 rounded ml16 mb-2 bg-white">
+            <i class="fa fa-bell mr-2 text-muted"/> Wishlisted Talks
+            <a t-att-href="'/event/%s/track?%s' % (slug(event), keep_query('*', search_wishlist=''))"
+                class="btn border-0 py-1">
+                &#215;
+            </a>
+        </span>
+
+        <t t-foreach="search_tags" t-as="tag">
+            <span class="align-items-baseline border d-inline-flex pl-2 mt-3 rounded ml16 mb-2 bg-white">
+                <i class="fa fa-tag mr-2 text-muted"/>
+                <t t-esc="tag.display_name"/>
+                <a t-att-href="'/event/%s/track?%s' % (slug(event), keep_query('*', tags=str((search_tags - tag).ids)))"
+                    class="btn border-0 py-1">
+                    &#215;
+                </a>
+            </span>
+        </t>
+    </div>
+</template>
+
+<!-- ============================================================ -->
+<!-- MISC TOOLS -->
+<!-- ============================================================ -->
+
+<template id="track_tag_badge_link" name="Track: Tag Badge Link">
+    <a t-if="search_tags"
+        t-att-href="'/event/%s/track?%s'% (
+            slug(event),
+            keep_query('*', tags=str((search_tags - tag).ids if tag in search_tags else (tag | search_tags).ids))
+        )"
+        t-att-class="'badge %s' % ('badge-primary' if tag in search_tags else 'o_tag_color_hovered_0')"
+        t-esc="tag.name"/>
+    <a t-else=""
+        t-att-href="'/event/%s/track?%s'% (
+            slug(event),
+            keep_query('*', tags=str(tag.ids))
+        )"
+        t-att-class="'badge o_tag_color_hovered_%s' % (tag.color)"
+        t-esc="tag.name"/>
+</template>
+
+<template id="track_tag_badge_info" name="Track: Tag Badge Info">
+    <span t-if="search_tags"
+        t-att-class="'badge %s' % ('badge-primary' if tag in search_tags else 'o_tag_color_0')"
+        t-esc="tag.name"/>
+    <span t-else=""
+        t-att-class="'badge o_tag_color_%s' % (tag.color)"
+        t-esc="tag.name"/>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_session/views/event_track_templates_misc.xml b/addons/website_event_track_session/views/event_track_templates_misc.xml
new file mode 100644
index 00000000000..27bcf0b994c
--- /dev/null
+++ b/addons/website_event_track_session/views/event_track_templates_misc.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <!-- De-activate old customize -->
+    <record id="website_event_track.tracks_filter" model="ir.ui.view">
+        <field name="active" eval="False"/>
+        <field name="customize_show" eval="False"/>
+    </record>
+    <record id="website_event_track_online.tracks_wishlist" model="ir.ui.view">
+        <field name="active" eval="False"/>
+        <field name="customize_show" eval="False"/>
+    </record>
+    <record id="website_event_track_online.track_view_wishlist" model="ir.ui.view">
+        <field name="active" eval="False"/>
+        <field name="customize_show" eval="False"/>
+    </record>
+
+</data></odoo>
diff --git a/addons/website_event_track_session/views/event_track_templates_page.xml b/addons/website_event_track_session/views/event_track_templates_page.xml
new file mode 100644
index 00000000000..a3875fe4cf9
--- /dev/null
+++ b/addons/website_event_track_session/views/event_track_templates_page.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_track_main" name="Event Exhibitor">
+    <t t-call="website_event.layout">
+        <div class="o_wevent_online o_wevent_online_bg o_wesession_index">
+            <!-- Options -->
+            <t t-set="option_widescreen" t-value="option_widescreen or False"/>
+            <t t-set="option_track_wishlist" t-value="not event.is_done and request.website.viewref('website_event_track_session.session_topbar_wishlist').active"/>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wesession_track_index_1" class="oe_structure"/>
+            <!-- Content -->
+            <div t-att-class="'o_wevent_online_page_container %s' % ('container pb-3' if not option_widescreen else 'pb-3')">
+                <div class="row mb-5 mx-0">
+                    <t t-call="website_event_track_session.event_track_aside"/>
+                    <t t-call="website_event_track_session.event_track_content"/>
+                </div>
+            </div>
+            <!-- Drag/Drop Area -->
+            <div id="oe_structure_wesession_track_index_2" class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+<!-- ============================================================ -->
+<!-- CONTENT: MAIN TEMPLATES -->
+<!-- ============================================================ -->
+
+<template id="event_track_content" name="Track: Main Description">
+    <div name="o_wesession_track_main"
+         t-att-class="'col-12 o_wevent_online_page_main o_wesession_track_main bg-white p-0 %s' % ('col-md-9 col-lg-10' if option_widescreen else 'col-md-8 col-lg-9')">
+        <!-- LIVE INFORMATIONS -->
+        <div t-if="not track.event_id.is_ongoing" class="pt-3">
+            <div class="mx-3 alert alert-warning">
+                Event <span t-esc="track.event_id.name" class="font-weight-bold"/>
+                <span t-if="track.event_id.start_today">
+                    starts in
+                    <span t-esc="track.event_id.start_remaining"
+                        t-options="{'widget': 'duration', 'digital': False, 'unit': 'minute', 'round': 'minute'}"/>
+                </span>
+                <span t-else="">
+                    starts at
+                    <span t-field="track.event_id.with_context(tz=track.event_id.date_tz).date_begin"
+                        t-options="{'format': 'long', 'tz_name': track.event_id.date_tz, 'hide_seconds': True}"/>
+                </span>
+            </div>
+        </div>
+        <div t-elif="track.track_start_remaining" class="pt-3">
+            <div class="mx-3 alert alert-warning">
+                Starting in
+                <span t-esc="track.track_start_remaining"
+                    t-options="{'widget': 'duration', 'digital': False, 'unit': 'second', 'round': 'minute'}"/>
+            </div>
+        </div>
+        <!-- TRACK DESCRIPTION -->
+        <div class="o_wesession_track_main_description">
+            <div class="mx-3 pt-3 d-flex justify-content-between">
+                <span class="h4" t-esc="track.name"/>
+                <div class="o_we_track_action_buttons d-flex justify-content-end align-items-center flex-wrap">
+                    <div class="o_we_track_reminder_button my-1">
+                        <!-- Mobile -->
+                        <div t-if="option_track_wishlist and not track.is_track_done"
+                            class="d-md-none d-inline ml-auto"
+                            t-call="website_event_track_online.track_widget_reminder">
+                            <t t-set="reminder_small" t-value="True"/>
+                            <t t-set="reminder_light" t-value="True"/>
+                            <t t-set="light_theme" t-value="False"/>
+                        </div>
+                        <!-- Desktop -->
+                        <div t-if="option_track_wishlist and not track.is_track_done"
+                            class="d-none d-sm-inline"
+                            t-call="website_event_track_online.track_widget_reminder">
+                            <t t-set="reminder_small" t-value="False"/>
+                            <t t-set="reminder_light" t-value="False"/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="mx-3 text-muted">
+                <span t-field="track.date"
+                    t-options='{"hide_seconds":"True", "format": "short"}'/>
+                -
+                <span t-field="track.date_end"
+                    t-options='{"hide_seconds":"True", "format": "short"}'/>
+                <t t-if="event.date_tz">
+                    (<span t-field="track.date_end" t-options='{"format": "zzz"}'/>)
+                </t>
+                (<span t-field="track.duration"
+                    t-options='{"widget": "duration", "unit": "hour", "round": "minute"}'/>)
+            </div>
+            <div class="mx-3 text-muted" t-if="track.location_id">
+                <strong>Location:</strong> <span t-field="track.location_id"/>
+            </div>
+            <hr class="mt-2 mb-0"/>
+
+            <!-- ABOUT AUTHOR -->
+            <div class="mx-3">
+                <div class="mt-2 d-flex">
+                    <span t-if="track.image" t-field="track.image" class="o_wevent_online_page_avatar"
+                        t-options="{'widget': 'image', 'class': 'rounded-circle', 'max_width': '96'}"/>
+                    <div class="px-3 d-flex flex-column">
+                        <span t-field="track.partner_name" class="font-weight-bold mb-2"/>
+                        <span class="mb-1 d-flex align-items-baseline text-break" t-if="track.partner_id.website">
+                            <i class="fa fa-home mr-2"/><a t-att-href="track.partner_id.website"><span t-field="track.partner_id.website"/></a>
+                        </span>
+                        <span class="mb-1 d-flex align-items-baseline text-break" t-if="track.partner_email">
+                            <i class="fa fa-envelope mr-2"/><a t-att-mailto="track.partner_email"><span t-field="track.partner_email"/></a>
+                        </span>
+                        <span class="mb-1 d-flex align-items-baseline text-break" t-if="track.partner_phone">
+                            <i class="fa fa-phone mr-2"/><span t-field="track.partner_phone"/>
+                        </span>
+                    </div>
+                </div>
+                <div t-field="track.partner_biography" class="oe_no_empty"/>
+                <hr t-if="not is_html_empty(track.description)" class="mt-2 pb-1 mb-1"/>
+            </div>
+            <div t-field="track.description" class="my-2 mx-3 oe_no_empty"/>
+        </div>
+    </div>
+</template>
+
+<!-- ============================================================ -->
+<!-- ASIDE: CONTROL PANEL -->
+<!-- ============================================================ -->
+
+<template id="event_track_aside" name="Track: Aside">
+    <div t-att-class="'col-12 pl-0 pr-0 pr-md-3 o_wevent_online_page_aside o_wesession_track_aside %s' % ('col-md-3 col-lg-2' if option_widescreen else 'col-md-4 col-lg-3')">
+        <div class="bg-white pt-0 pt-md-3 o_wevent_online_page_aside_content">
+            <div class="mx-2" t-if="track.website_cta">
+                <t t-set="cta_coundown" t-value="bool(track.website_cta_start_remaining)"/>
+                <div t-if="cta_coundown" class="text-center mt-2 mt-md-0 w-100 btn btn-primary d-none">
+                    <t t-call="website_event_online.display_timer_widget">
+                        <t t-set="pre_remaining_time" t-value="int(track.track_start_remaining)"/>
+                        <!--<t t-set="pre_countdown_text" t-value="'Talk starts in'"/>-->
+                        <t t-set="pre_countdown_display" t-value="bool(False)"/>
+                        <t t-set="main_remaining_time" t-value="int(track.website_cta_start_remaining)"/>
+                        <!--<t t-set="main_countdown_text" t-value="'Magic happens in'"/>-->
+                        <t t-set="main_countdown_display" t-value="bool(False)"/>
+                        <t t-set="display_class" t-value="'.o_event_cta_action'"/>
+                    </t>
+                </div>
+                <div t-att-class="'o_event_cta_action %s' % ('d-none' if cta_coundown else '')">
+                    <a t-att-href="track.website_cta_url"
+                        target="_blank"
+                        class="btn btn-primary w-100 mb-3 mt-2 mt-md-0">
+                        <span t-esc="track.website_cta_title"/>
+                    </a>
+                </div>
+            </div>
+            <div class="d-flex align-items-center justify-content-between mx-2">
+                <ul class="nav nav-tabs o_wesession_track_aside_nav d-flex border-0" role="tablist">
+                    <li class="nav-item flex-grow-1">
+                        <a href="#track_list" aria-controls="track_list" class="nav-link active" role="tab" data-toggle="tab">
+                            Talks
+                        </a>
+                    </li>
+                </ul>
+                <a href="#collapse_track_aside" data-toggle="collapse" class="d-md-none p-2 text-decoration-none o_wevent_online_page_aside_collapse collapsed">
+                    <i class="fa fa-chevron-down d-md-none"/>
+                </a>
+            </div>
+            <div id="collapse_track_aside"
+                class="tab-content collapse d-md-block o_wesession_track_aside_tabs">
+                <div class="tab-pane fade show active" id="track_list" role="tabpanel">
+                    <ul class="list-unstyled mb-0">
+                        <li t-foreach="tracks_other" t-as="track_other" class="w-100">
+                            <a t-if="user_event_manager or track_other.is_published"
+                                class="d-block w-100 h-100 px-2 pt-2 pb-1 text-decoration-none"
+                                t-att-href="track_other.website_url">
+                                <t t-call="website_event_track_session.event_track_aside_other_track"/>
+                            </a>
+                            <div t-else="" class="text-muted px-2 pt-2 pb-1">
+                                <t t-call="website_event_track_session.event_track_aside_other_track"/>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<template id="event_track_aside_other_track">
+    <span t-esc="track_other.name" class="w-100"/>
+    <div class="d-flex align-items-center">
+        <small class="text-muted" t-esc="track_other.partner_id.name"/>
+        <div class="d-inline-block ml-auto o_wesession_track_aside_info text-truncate">
+            <small t-if="track_other.is_track_live and not track_other.is_track_done"
+                class="badge badge-danger">Live</small>
+            <small t-elif="track_other.is_track_done"
+                class="badge badge-light">Done</small>
+            <small t-elif="track_other.is_track_today and track_other.track_start_remaining"
+                class="badge badge-light">
+                <span t-esc="track_other.track_start_remaining"
+                    t-options="{'widget': 'duration', 'digital': False, 'add_direction': True,
+                                'unit': 'second', 'round': 'minute', 'format': 'narrow'}"/>
+            </small>
+            <small t-elif="track_other.date"
+                class="badge badge-light">
+                <span t-esc="track_other.date"
+                    t-options="{'widget': 'datetime', 'format': 'short'}"/>
+                <span t-esc="track_other.date"
+                    t-options="{'widget': 'datetime', 'tz_name': track_other.event_id.date_tz, 'format': 'ZZZZ'}"/>
+            </small>
+        </div>
+    </div>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_session/views/event_track_views.xml b/addons/website_event_track_session/views/event_track_views.xml
new file mode 100644
index 00000000000..a80870faf2d
--- /dev/null
+++ b/addons/website_event_track_session/views/event_track_views.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record id="event_track_view_form" model="ir.ui.view">
+        <field name="name">event.track.view.form.inherit.session</field>
+        <field name="model">event.track</field>
+        <field name="inherit_id" ref="website_event_track.view_event_track_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='description']" position="after">
+                <page string="Interactivity" name="interactivity">
+                    <group>
+                        <group name="event_track_cta_group">
+                            <field name="website_cta"/>
+                            <field name="website_cta_title" placeholder="e.g. Get Yours Now !"
+                                attrs="{'invisible': [('website_cta', '=', False)],
+                                        'required': [('website_cta', '=', True)]}"/>
+                            <field name="website_cta_url" placeholder="e.g. http://www.example.com"
+                                attrs="{'invisible': [('website_cta', '=', False)],
+                                        'required': [('website_cta', '=', True)]}"/>
+                            <label for="website_cta_delay"
+                                attrs="{'invisible': [('website_cta', '=', False)]}"/>
+                            <div attrs="{'invisible': [('website_cta', '=', False)]}">
+                                <field name="website_cta_delay" class="oe_inline"
+                                    attrs="{'required': [('website_cta', '=', True)]}"/> minutes after talk start
+                            </div>
+                        </group>
+                    </group>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/website_jitsi/__init__.py b/addons/website_jitsi/__init__.py
new file mode 100644
index 00000000000..7d34c7c054a
--- /dev/null
+++ b/addons/website_jitsi/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
+from . import models
diff --git a/addons/website_jitsi/__manifest__.py b/addons/website_jitsi/__manifest__.py
new file mode 100644
index 00000000000..af6638c3739
--- /dev/null
+++ b/addons/website_jitsi/__manifest__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+    "name": "Website Jitsi",
+    'category': 'Hidden',
+    'version': '1.0',
+    "summary": "Create Jitsi room on website.",
+    'website': 'https://www.odoo.com/page/events',
+    "description": "Create Jitsi room on website.",
+    "depends": [
+        "website"
+    ],
+    "data": [
+        'views/assets.xml',
+        'views/chat_room_templates.xml',
+        'views/chat_room_views.xml',
+    ],
+    'application': False,
+}
diff --git a/addons/website_jitsi/controllers/__init__.py b/addons/website_jitsi/controllers/__init__.py
new file mode 100644
index 00000000000..5d4b25db9c0
--- /dev/null
+++ b/addons/website_jitsi/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import main
diff --git a/addons/website_jitsi/controllers/main.py b/addons/website_jitsi/controllers/main.py
new file mode 100644
index 00000000000..b7c91ea7f9f
--- /dev/null
+++ b/addons/website_jitsi/controllers/main.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from werkzeug.exceptions import NotFound
+
+from odoo import http
+from odoo.http import request
+
+
+class WebsiteJitsiController(http.Controller):
+
+    @http.route(["/jitsi/update_status"], type="json", auth="public")
+    def jitsi_update_status(self, room_name, participant_count, joined):
+        """ Update room status: participant count, max reached
+
+        Use the SQL keywords "FOR UPDATE SKIP LOCKED" in order to skip if the row
+        is locked (instead of raising an exception, wait for a moment and retry).
+        This endpoint may be called multiple times and we don't care having small
+        errors in participant count compared to performance issues.
+
+        :raise ValueError: wrong participant count
+        :raise NotFound: wrong room name
+        """
+        if participant_count < 0:
+            raise ValueError()
+
+        chat_room = self._chat_room_exists(room_name)
+        if not chat_room:
+            raise NotFound()
+
+        request.env.cr.execute(
+            """
+            WITH req AS (
+                SELECT id
+                  FROM chat_room
+                  -- Can not update the chat room if we do not have its name
+                 WHERE name = %s
+                   FOR UPDATE SKIP LOCKED
+            )
+            UPDATE chat_room AS wcr
+               SET participant_count = %s,
+                   last_activity = NOW(),
+                   max_participant_reached = GREATEST(max_participant_reached, %s)
+              FROM req
+             WHERE wcr.id = req.id;
+            """,
+            [room_name, participant_count, participant_count]
+        )
+
+    @http.route(["/jitsi/is_full"], type="json", auth="public")
+    def jitsi_is_full(self, room_name):
+        return self._chat_room_exists(room_name).is_full
+
+    # ------------------------------------------------------------
+    # TOOLS
+    # ------------------------------------------------------------
+
+    def _chat_room_exists(self, room_name):
+        return request.env["chat.room"].sudo().search([("name", "=", room_name)], limit=1)
diff --git a/addons/website_jitsi/models/__init__.py b/addons/website_jitsi/models/__init__.py
new file mode 100644
index 00000000000..222bc1df76a
--- /dev/null
+++ b/addons/website_jitsi/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import chat_room
+from . import chat_room_mixin
diff --git a/addons/website_jitsi/models/chat_room.py b/addons/website_jitsi/models/chat_room.py
new file mode 100644
index 00000000000..8494f01c01d
--- /dev/null
+++ b/addons/website_jitsi/models/chat_room.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import re
+
+from uuid import uuid4
+
+from odoo import api, fields, models
+from odoo.tools import remove_accents
+
+
+class ChatRoom(models.Model):
+    """ Store all useful information to manage chat room (currently limited
+    to Jitsi). This model embeds all information about the chat room. We do not
+    store them in the related mixin (see chat.room.mixin) to avoid to add too
+    many fields on the models which want to use the chat room mixin as the
+    behavior can be optional in those models.
+
+    The participant count is automatically updated thanks to the chat room widget
+    to avoid having a costly computed field with a members model.
+    """
+    _name = "chat.room"
+    _description = "Chat Room"
+
+    def _default_name(self):
+        return "odoo-room-%s" % str(uuid4())[:8]
+
+    name = fields.Char(
+        "Room Name", required=True, copy=False,
+        default=lambda self: self._default_name())
+    is_full = fields.Boolean("Full", compute="_compute_is_full")
+    lang_id = fields.Many2one(
+        "res.lang", "Language",
+        default=lambda self: self.env["res.lang"].search([("code", "=", self.env.user.lang)], limit=1))
+    max_capacity = fields.Selection(
+        [("4", "4"), ("8", "8"), ("12", "12"), ("16", "16"),
+         ("20", "20"), ("no_limit", "No limit")], string="Max capacity",
+        default="8", required=True)
+    participant_count = fields.Integer("Participant count", default=0, copy=False)
+    # reporting fields
+    last_activity = fields.Datetime(
+        "Last Activity", copy=False, readonly=True,
+        default=lambda self: fields.Datetime.now())
+    max_participant_reached = fields.Integer(
+        "Max participant reached", copy=False, readonly=True,
+        help="Maximum number of participant reached in the room at the same time")
+
+    @api.depends("max_capacity", "participant_count")
+    def _compute_is_full(self):
+        for room in self:
+            if room.max_capacity == "no_limit":
+                room.is_full = False
+            else:
+                room.is_full = room.participant_count >= int(room.max_capacity)
+
+    def _jitsi_sanitize_name(self, name):
+        return re.sub(r'[^\w+.]+', '-', remove_accents(name).lower())
diff --git a/addons/website_jitsi/models/chat_room_mixin.py b/addons/website_jitsi/models/chat_room_mixin.py
new file mode 100644
index 00000000000..f5071b13d5e
--- /dev/null
+++ b/addons/website_jitsi/models/chat_room_mixin.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class ChatRoomMixin(models.AbstractModel):
+    """Add the chat room configuration (`chat.room`) on the needed models.
+
+    The chat room configuration contains all information about the room. So, we store
+    all the chat room logic at the same place, for all models.
+    Embed chat room related fields prefixed with `room_`.
+    """
+    _name = "chat.room.mixin"
+    _description = "Chat Room Mixin"
+    ROOM_CONFIG_FIELDS = [
+        ('room_name', 'name'),
+        ('room_lang_id', 'lang_id'),
+        ('room_max_capacity', 'max_capacity'),
+        ('room_participant_count', 'participant_count')
+    ]
+
+    chat_room_id = fields.Many2one("chat.room", "Chat Room", readonly=True, copy=False, ondelete="set null")
+    # chat room related fields
+    room_name = fields.Char("Room Name", related="chat_room_id.name")
+    room_is_full = fields.Boolean("Room Is Full", related="chat_room_id.is_full")
+    room_lang_id = fields.Many2one("res.lang", "Language", related="chat_room_id.lang_id", readonly=False)
+    room_max_capacity = fields.Selection(string="Max capacity", related="chat_room_id.max_capacity", readonly=False, required=True)
+    room_participant_count = fields.Integer("Participant count", related="chat_room_id.participant_count", readonly=False)
+    room_last_activity = fields.Datetime("Last activity", related="chat_room_id.last_activity")
+    room_max_participant_reached = fields.Integer("Max participant reached", related="chat_room_id.max_participant_reached")
+
+    @api.model_create_multi
+    def create(self, values_list):
+        for values in values_list:
+            if any(values.get(fmatch[0]) for fmatch in self.ROOM_CONFIG_FIELDS) and not values.get('chat_room_id'):
+                room_values = dict((fmatch[1], values[fmatch[0]]) for fmatch in self.ROOM_CONFIG_FIELDS if values.get(fmatch[0]))
+                values['chat_room_id'] = self.env['chat.room'].create(room_values).id
+        return super(ChatRoomMixin, self).create(values_list)
+
+    def write(self, values):
+        if any(values.get(fmatch[0]) for fmatch in self.ROOM_CONFIG_FIELDS):
+            for document in self.filtered(lambda doc: not doc.chat_room_id):
+                room_values = dict((fmatch[1], values[fmatch[0]]) for fmatch in self.ROOM_CONFIG_FIELDS if values.get(fmatch[0]))
+                document.chat_room_id = self.env['chat.room'].create(room_values).id
+        return super(ChatRoomMixin, self).write(values)
+
+    def copy(self, default=None):
+        if self.chat_room_id:
+            chat_room_id = self.chat_room_id.copy()
+            default = dict(default or {}, chat_room_id=chat_room_id.id)
+        return super(ChatRoomMixin, self).copy(default)
+
+    def unlink(self):
+        if self.chat_room_id:
+            self.chat_room_id.unlink()
+        return super(ChatRoomMixin, self).unlink()
diff --git a/addons/website_jitsi/security/ir.model.access.csv b/addons/website_jitsi/security/ir.model.access.csv
new file mode 100644
index 00000000000..eacbd51548b
--- /dev/null
+++ b/addons/website_jitsi/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_chat_room_all,access_chat_room,model_chat_room,,0,0,0,0
+access_chat_room_user,access_chat_room,model_chat_room,base.group_user,1,0,0,0
+access_chat_room_system,access_chat_room,model_chat_room,base.group_system,1,1,1,1
diff --git a/addons/website_jitsi/static/src/css/chat_room.css b/addons/website_jitsi/static/src/css/chat_room.css
new file mode 100644
index 00000000000..a51f80b6177
--- /dev/null
+++ b/addons/website_jitsi/static/src/css/chat_room.css
@@ -0,0 +1,17 @@
+.o_wjitsi_room_modal .modal-dialog {
+    top: 10%;
+    max-width: 100vw;
+    max-height: 100vh;
+    width: 80%;
+    margin: auto;
+}
+
+.o_wjitsi_room_modal .modal-body {
+    height: 70vh;
+    overflow: hidden;
+    margin: 0;
+}
+
+.o_wjitsi_chat_room_loading {
+    top: 40%;
+}
diff --git a/addons/website_jitsi/static/src/js/chat_room.js b/addons/website_jitsi/static/src/js/chat_room.js
new file mode 100644
index 00000000000..f57a67a0a54
--- /dev/null
+++ b/addons/website_jitsi/static/src/js/chat_room.js
@@ -0,0 +1,271 @@
+odoo.define('website_jitsi.chat_room', function (require) {
+'use strict';
+
+const config = require("web.config");
+const core = require('web.core');
+const Dialog = require('web.Dialog');
+const publicWidget = require('web.public.widget');
+const QWeb = core.qweb;
+const _t = core._t;
+
+publicWidget.registry.ChatRoom = publicWidget.Widget.extend({
+    selector: '.o_wjitsi_room_widget',
+    xmlDependencies: ['/website_jitsi/static/src/xml/chat_room_modal.xml'],
+    events: {
+        'click .o_wjitsi_room_link': '_onChatRoomClick',
+    },
+
+    start: async function () {
+        await this._super.apply(this, arguments);
+        this.roomName = this.$el.data('room-name');
+        this.chatRoomId = parseInt(this.$el.data('chat-room-id'));
+        // automatically open the current room
+        this.autoOpen = parseInt(this.$el.data('auto-open') || 0);
+        // before joining, perform a RPC call to verify that the chat room is not full
+        this.checkFull = parseInt(this.$el.data('check-full') || 0);
+        // query selector of the element on which we attach the Jitsi iframe
+        // if not defined, the widget will pop in a modal instead
+        this.attachTo = this.$el.data('attach-to') || false;
+        // default username for jitsi
+        this.defaultUsername = this.$el.data('default-username') || false;
+
+        if (this.autoOpen) {
+            await this._onChatRoomClick();
+        }
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+      * Click on a chat room to join it.
+      *
+      * @private
+      */
+    _onChatRoomClick: async function () {
+        if (this.checkFull) {
+            // maybe we didn't refresh the page for a while and so we might join a room
+            // which is full, so we perform a RPC call to verify that we can really join
+            let isChatRoomFull = await this._rpc({
+                route: '/jitsi/is_full',
+                params: {
+                    room_name: this.roomName,
+                },
+            });
+
+            if (isChatRoomFull) {
+                Dialog.alert(this, _t("Sorry, this room is full"), {
+                    title: _t("Warning"),
+                    // reload the page to refresh the participant count
+                    confirm_callback: () => window.location.reload(),
+                });
+                return;
+            }
+        }
+
+        if (await this._openMobileApplication(this.roomName)) {
+            // we opened the mobile application
+            return;
+        }
+
+        await this._loadJisti();
+
+        if (this.attachTo) {
+            // attach the Jitsi iframe on the given parent node
+            let $parentNode = $(this.attachTo);
+            $parentNode.find("iframe").trigger("empty");
+            $parentNode.empty();
+
+            let jitsiRoom = await this._joinJitsiRoom($parentNode);
+
+            $(jitsiRoom._frame).on("empty", async () => {
+                // we opened an other Jitsi room on the same parent node
+                await this._updatePartitipantCountIfEmpty();
+            });
+
+            jitsiRoom.addEventListener('videoConferenceLeft', async () => {
+                await this._updatePartitipantCountIfEmpty();
+            });
+        } else {
+            // create a model and append the Jitsi iframe in it
+            let $jitsiModal = $(QWeb.render('chat_room_modal', {}));
+            $("body").append($jitsiModal);
+            $jitsiModal.modal('show');
+
+            let jitsiRoom = await this._joinJitsiRoom($jitsiModal.find('.modal-body'));
+
+            // close the modal when hanging up
+            jitsiRoom.addEventListener('videoConferenceLeft', async () => {
+                $('.o_wjitsi_room_modal').modal('hide');
+            });
+
+            // when the modal is closed, delete the Jitsi room object and clear the DOM
+            $jitsiModal.on('hidden.bs.modal', async () => {
+                jitsiRoom.dispose();
+                $(".o_wjitsi_room_modal").remove();
+                await this._updatePartitipantCountIfEmpty();
+            });
+        }
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    /**
+      * Jitsi do not provide an REST API to get the number of participant in a room.
+      * The only way to get the number of participant is to be in the room and to use
+      * the Javascript API. So, to update the participant count on the server side,
+      * the participant have to send the count in RPC...
+      *
+      * When leaving a room, the event "participantLeft" is called for the current user
+      * once per participant in the room (like if all other participants were leaving the
+      * room and then the current user himself).
+      *
+      * "participantLeft" is called only one time for the other participant who are still
+      * in the room.
+      *
+      * We can not ask the user who is leaving the room to update the participant count
+      * because user might close their browser tab without hanging up (and so without
+      * triggering the event "videoConferenceLeft"). So, we wait for a moment (because the
+      * event "participantLeft" is called many time for the participant who is leaving)
+      * and the first participant send the new participant count (so we avoid spamming the
+      * server with HTTP requests).
+      *
+      * We use "setTimout" to send maximum one HTTP request per interval, even if multiple
+      * participants join/leave at the same time in the defined interval.
+      *
+      * Update on the 29 June 2020
+      *
+      * @private
+      * @param {jQuery} $jitsiModal, jQuery modal element in which we add the Jitsi room
+      * @returns {JitsiRoom} the newly created Jitsi room
+      */
+    _joinJitsiRoom: async function ($parentNode) {
+        let jitsiRoom = await this._createJitsiRoom(this.roomName, $parentNode);
+
+        if (this.defaultUsername) {
+            jitsiRoom.executeCommand("displayName", this.defaultUsername);
+        }
+
+        let timeoutCall = null;
+        const updateParticipantCount = (joined) => {
+            // we clear the old timeout to be sure to call it only once each 2 seconds
+            // (so if 2 participants join/leave in this interval, we will perform only
+            // one HTTP request for both).
+            clearTimeout(timeoutCall);
+            timeoutCall = setTimeout(() => {
+                this.allParticipantIds = Object.keys(jitsiRoom._participants).sort();
+                if (this.participantId === this.allParticipantIds[0]) {
+                    // only the first participant of the room send the new participant
+                    // count so we avoid to send to many HTTP requests
+                    this._updateParticipantCount(this.allParticipantIds.length, joined);
+                }
+            }, 2000);
+        };
+
+        jitsiRoom.addEventListener('participantJoined', () => updateParticipantCount(true));
+        jitsiRoom.addEventListener('participantLeft', () => updateParticipantCount(false));
+
+        // update the participant count when joining the room
+        jitsiRoom.addEventListener('videoConferenceJoined', async (event) => {
+            this.participantId = event.id;
+            updateParticipantCount(true);
+            $('.o_wjitsi_chat_room_loading').addClass('d-none');
+        });
+
+        return jitsiRoom;
+    },
+
+    /**
+      * If we are the last participant in the room, we are the only one who can send the
+      * "zero participant" update to the server.
+      *
+      * @private
+      */
+    _updatePartitipantCountIfEmpty: async function () {
+        if (this.allParticipantIds && this.allParticipantIds.length === 1 && this.allParticipantIds[0] === this.participantId) {
+          // we are the last participant in the room and we left it
+          await this._updateParticipantCount(0, false);
+        }
+    },
+
+    /**
+      * Perform an HTTP request to update the participant count on the server side.
+      *
+      * @private
+      * @param {integer} count, current number of participant in the room
+      * @param {boolean} joined, true if someone joined the room
+      */
+    _updateParticipantCount: async function (count, joined) {
+        await this._rpc({
+            route: '/jitsi/update_status',
+            params: {
+                room_name: this.roomName,
+                participant_count: count,
+                joined: joined,
+            },
+        });
+    },
+
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    /**
+      * Redirect on the Jitsi mobile application if we are on mobile.
+      *
+      * @private
+      * @param {string} roomName
+      * @returns {boolean} true is we were redirected to the mobile application
+      */
+    _openMobileApplication: async function (roomName) {
+        if (config.device.isMobile) {
+            // we are on mobile, open the room in the application
+            window.location = `intent://meet.jit.si/${roomName}#Intent;scheme=org.jitsi.meet;package=org.jitsi.meet;end`;
+            return true;
+        }
+        return false;
+    },
+
+    /**
+      * Create a Jitsi room on the given DOM element.
+      *
+      * @private
+      * @param {string} roomName
+      * @param {jQuery} $parentNode
+      * @returns {JitsiRoom} the newly created Jitsi room
+      */
+    _createJitsiRoom: async function (roomName, $parentNode) {
+      await this._loadJisti();
+        const domain = "meet.jit.si";
+        const options = {
+            roomName: roomName,
+            width: "100%",
+            height: "100%",
+            parentNode: $parentNode[0],
+            configOverwrite: {disableDeepLinking: true},
+        };
+        return new window.JitsiMeetExternalAPI(domain, options);
+    },
+
+    /**
+      * Load the Jitsi external library if necessary.
+      *
+      * @private
+      */
+    _loadJisti: async function () {
+      if (!window.JitsiMeetExternalAPI) {
+          await $.ajax({
+              url: "https://meet.jit.si/external_api.js",
+              dataType: "script",
+          });
+      }
+    },
+});
+
+return publicWidget.registry.ChatRoom;
+
+});
diff --git a/addons/website_jitsi/static/src/xml/chat_room_modal.xml b/addons/website_jitsi/static/src/xml/chat_room_modal.xml
new file mode 100644
index 00000000000..d076a31739f
--- /dev/null
+++ b/addons/website_jitsi/static/src/xml/chat_room_modal.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+    <t t-name="chat_room_modal">
+        <div class="o_wjitsi_room_modal modal fade" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content border-0">
+                    <main class="modal-body p-0">
+                        <div class="o_wjitsi_chat_room_loading position-absolute w-100 text-center text-muted">
+                            <i class="fa fa-spin fa-spinner mr-3"/>
+                            <span>Loading your room...</span>
+                        </div>
+                    </main>
+                    <footer class="modal-footer">
+                        <button class="btn btn-primary" data-dismiss="modal" type="button">Close</button>
+                    </footer>
+                </div>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/addons/website_jitsi/views/assets.xml b/addons/website_jitsi/views/assets.xml
new file mode 100644
index 00000000000..ced7415c40e
--- /dev/null
+++ b/addons/website_jitsi/views/assets.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Chat Room Assets Frontend">
+        <xpath expr="//link[last()]" position="after">
+            <link href="/website_jitsi/static/src/css/chat_room.css" rel="stylesheet" type="text/css"/>
+        </xpath>
+        <xpath expr="//script[last()]" position="after">
+            <script src="/website_jitsi/static/src/js/chat_room.js" type="text/javascript"/>
+        </xpath>
+    </template>
+</odoo>
diff --git a/addons/website_jitsi/views/chat_room_templates.xml b/addons/website_jitsi/views/chat_room_templates.xml
new file mode 100644
index 00000000000..69274f284ff
--- /dev/null
+++ b/addons/website_jitsi/views/chat_room_templates.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+
+    <template id="chat_room_join_button">
+        <div t-att-class="'o_wjitsi_room_widget %s' % (_classes or '')"
+            t-att-data-chat-room-id="chat_room_id"
+            t-att-data-room-name="room_name"
+            t-att-data-auto-open="auto_open"
+            t-att-data-check-full="check_full"
+            t-att-data-attach-to="attach_to"
+            t-att-data-default-username="default_username">
+            <button class="o_wjitsi_room_link btn btn-primary">Join the room</button>
+        </div>
+    </template>
+
+</data></odoo>
diff --git a/addons/website_jitsi/views/chat_room_views.xml b/addons/website_jitsi/views/chat_room_views.xml
new file mode 100644
index 00000000000..61dc4bca95a
--- /dev/null
+++ b/addons/website_jitsi/views/chat_room_views.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="chat_room_view_search" model="ir.ui.view">
+        <field name="name">chat.room.search</field>
+        <field name="model">chat.room</field>
+        <field name="arch" type="xml">
+            <search string="Chat Room">
+                <field name="name"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="chat_room_view_form" model="ir.ui.view">
+        <field name="name">chat.room.form</field>
+        <field name="model">chat.room</field>
+        <field name="arch" type="xml">
+            <form string="Chat Room">
+                <sheet>
+                    <label for="name"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <group>
+                        <group>
+                            <field name="is_full"/>
+                            <field name="lang_id" options="{'no_create': True}"/>
+                            <field name="participant_count"/>
+                            <field name="max_capacity"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page name="Reporting" string="Reporting">
+                            <group>
+                                <field name="last_activity"/>
+                                <field name="max_participant_reached"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="chat_room_view_tree" model="ir.ui.view">
+        <field name="name">chat.room.tree</field>
+        <field name="model">chat.room</field>
+        <field name="arch" type="xml">
+            <tree string="Chat Room">
+                <field name="name"/>
+                <field name="is_full"/>
+                <field name="lang_id"/>
+                <field name="participant_count"/>
+                <field name="max_capacity"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="chat_room_action" model="ir.actions.act_window">
+        <field name="name">Chat Rooms</field>
+        <field name="res_model">chat.room</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem name="Chat Rooms"
+        id="chat_room_menu"
+        sequence="50"
+        action="chat_room_action"
+        parent="website.menu_website_global_configuration"
+        groups="base.group_no_one"/>
+</odoo>