diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py
index 5712bafd0d2..566a41f036f 100644
--- a/addons/event/__manifest__.py
+++ b/addons/event/__manifest__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': 'Events Organization',
-    'version': '1.2',
+    'version': '1.3',
     'website': 'https://www.odoo.com/page/events',
     'category': 'Marketing/Events',
     'summary': 'Trainings, Conferences, Meetings, Exhibitions, Registrations',
diff --git a/addons/event/data/event_demo_misc.xml b/addons/event/data/event_demo_misc.xml
index cbb647d8041..a87cce5d7bb 100644
--- a/addons/event/data/event_demo_misc.xml
+++ b/addons/event/data/event_demo_misc.xml
@@ -42,51 +42,60 @@
         <field name="name">5-10</field>
         <field name="sequence">1</field>
         <field name="category_id" ref="event_tag_category_1"/>
+        <field name="color">1</field>
     </record>
 
     <record id="event_tag_category_1_tag_2" model="event.tag">
         <field name="name">10-14</field>
         <field name="sequence">2</field>
         <field name="category_id" ref="event_tag_category_1"/>
+        <field name="color">2</field>
     </record>
 
     <record id="event_tag_category_1_tag_3" model="event.tag">
         <field name="name">15-18</field>
         <field name="sequence">3</field>
         <field name="category_id" ref="event_tag_category_1"/>
+        <field name="color">3</field>
     </record>
 
     <record id="event_tag_category_1_tag_4" model="event.tag">
         <field name="name">18+</field>
         <field name="sequence">4</field>
         <field name="category_id" ref="event_tag_category_1"/>
+        <field name="color">4</field>
     </record>
 
     <record id="event_tag_category_2_tag_1" model="event.tag">
         <field name="name">Culture</field>
         <field name="sequence">10</field>
         <field name="category_id" ref="event_tag_category_2"/>
+        <field name="color">5</field>
     </record>
     <record id="event_tag_category_2_tag_2" model="event.tag">
         <field name="name">Music</field>
         <field name="sequence">11</field>
         <field name="category_id" ref="event_tag_category_2"/>
+        <field name="color">6</field>
     </record>
     <record id="event_tag_category_2_tag_3" model="event.tag">
         <field name="name">Sport</field>
         <field name="sequence">12</field>
         <field name="category_id" ref="event_tag_category_2"/>
+        <field name="color">7</field>
     </record>
 
     <record id="event_tag_category_3_tag_1" model="event.tag">
         <field name="name">Online</field>
         <field name="sequence">20</field>
         <field name="category_id" ref="event_tag_category_3"/>
+        <field name="color">8</field>
     </record>
     <record id="event_tag_category_3_tag_2" model="event.tag">
         <field name="name">Conference</field>
         <field name="sequence">21</field>
         <field name="category_id" ref="event_tag_category_3"/>
+        <field name="color">9</field>
     </record>
 
 </data></odoo>
diff --git a/addons/event/models/event_tag.py b/addons/event/models/event_tag.py
index a4dcad1a5b3..dd097c333a7 100644
--- a/addons/event/models/event_tag.py
+++ b/addons/event/models/event_tag.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import _, api, fields, models
+from random import randint
+
+from odoo import api, fields, models
 
 
 class EventTagCategory(models.Model):
@@ -18,9 +20,15 @@ class EventTag(models.Model):
     _description = "Event Tag"
     _order = "sequence"
 
+    def _default_color(self):
+        return randint(1, 11)
+
     name = fields.Char("Name", required=True, translate=True)
     sequence = fields.Integer('Sequence', default=0)
     category_id = fields.Many2one("event.tag.category", string="Category", required=True, ondelete='cascade')
+    color = fields.Integer(
+        string='Color Index', default=lambda self: self._default_color(),
+        help='Tag color. No color means no display in kanban or front-end, to distinguish internal tags from public categorization tags.')
 
     def name_get(self):
         return [(tag.id, "%s: %s" % (tag.category_id.name, tag.name)) for tag in self]
diff --git a/addons/event/models/res_config_settings.py b/addons/event/models/res_config_settings.py
index 69201cdbd2d..15af322830c 100644
--- a/addons/event/models/res_config_settings.py
+++ b/addons/event/models/res_config_settings.py
@@ -6,7 +6,11 @@ class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_event_sale = fields.Boolean("Tickets")
+    module_website_event_meet = fields.Boolean("Discussion Rooms")
     module_website_event_track = fields.Boolean("Tracks and Agenda")
+    module_website_event_track_live = fields.Boolean("Live Mode")
+    module_website_event_track_quiz = fields.Boolean("Quiz on Tracks")
+    module_website_event_track_exhibitor = fields.Boolean("Advanced Sponsors")
     module_website_event_questions = fields.Boolean("Registration Survey")
     module_event_barcode = fields.Boolean("Barcode")
     module_website_event_sale = fields.Boolean("Online Ticketing")
diff --git a/addons/event/views/event_tag_views.xml b/addons/event/views/event_tag_views.xml
index 10c94b0e82c..a1fe03843fd 100644
--- a/addons/event/views/event_tag_views.xml
+++ b/addons/event/views/event_tag_views.xml
@@ -9,7 +9,7 @@
                 <tree string="Event Category">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
-                    <field name="tag_ids" widget="many2many_tags" />
+                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
                 </tree>
             </field>
         </record>
@@ -28,6 +28,7 @@
                                 <tree string="Tags" editable="bottom">
                                     <field name="sequence" widget="handle"/>
                                     <field name="name"/>
+                                    <field name="color" widget="color_picker"/>
                                 </tree>
                             </field>
                         </group>
@@ -51,6 +52,7 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="category_id"/>
+                    <field name="color" widget="color_picker"/>
                 </tree>
             </field>
         </record>
@@ -64,6 +66,7 @@
                         <group>
                             <field name="name"/>
                             <field name="category_id" widget="many2one"/>
+                            <field name="color" widget="color_picker"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index faa081e643c..f3029824812 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -78,7 +78,7 @@
                                     <label for="tag_ids" string="Tags"/>
                                     <div class="row">
                                         <div class="col-12 mt16">
-                                            <field name="tag_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
+                                            <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_quick_create': True}"/>
                                         </div>
                                     </div>
                                 </div>
@@ -232,7 +232,7 @@
                                 </div>
                                 <field name="date_tz"/>
                                 <field name="event_type_id" string="Template" options="{'no_create':True}"/>
-                                <field name="tag_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
+                                <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_quick_create': True}"/>
                             </group>
                             <group>
                                 <field name="organizer_id"/>
diff --git a/addons/event/views/res_config_settings_views.xml b/addons/event/views/res_config_settings_views.xml
index 8636b17efa3..9e70837b7a3 100644
--- a/addons/event/views/res_config_settings_views.xml
+++ b/addons/event/views/res_config_settings_views.xml
@@ -22,6 +22,44 @@
                                     <div class="text-muted">
                                         Manage &amp; publish a schedule with tracks
                                     </div>
+                                    <div class="mt-3 d-flex" attrs="{'invisible': [('module_website_event_track', '=', False)]}">
+                                        <field name="module_website_event_track_live" class="w-auto"/>
+                                        <div>
+                                            <label string="Live Mode" for="module_website_event_track_live"/><br/>
+                                            <span class="text-muted">Youtube support, Chat</span>
+                                        </div>
+                                    </div>
+                                    <div class="mt-3 d-flex" attrs="{'invisible': [('module_website_event_track', '=', False)]}">
+                                        <field name="module_website_event_track_quiz" class="w-auto"/>
+                                        <div>
+                                            <label string="Quizzes on tracks" for="module_website_event_track_quiz"/><br/>
+                                            <span class="text-muted">Quizzes, leaderboard</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div>
+                                    <div class="o_setting_left_pane">
+                                        <field name="module_website_event_meet"/>
+                                    </div>
+                                    <div class="o_setting_right_pane">
+                                        <label string="Discussion Rooms" for="module_website_event_meet"/>
+                                        <div class="text-muted">
+                                            Integrate discussion rooms
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="mt-3">
+                                    <div class="o_setting_left_pane">
+                                        <field name="module_website_event_track_exhibitor"/>
+                                    </div>
+                                    <div class="o_setting_right_pane">
+                                        <label string="Advanced Sponsors" for="module_website_event_track_exhibitor"/>
+                                        <div class="text-muted">
+                                            Chat, advanced exhibitors
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/im_livechat/static/src/legacy/public_livechat.js b/addons/im_livechat/static/src/legacy/public_livechat.js
index 5a29d6e667f..4f14fbb06f7 100644
--- a/addons/im_livechat/static/src/legacy/public_livechat.js
+++ b/addons/im_livechat/static/src/legacy/public_livechat.js
@@ -111,7 +111,7 @@ var LivechatButton = Widget.extend({
             this.$el.css('color', this.options.button_text_color);
         }
 
-        // If website_event_track_online installed, put the livechat banner above the PWA banner.
+        // If website_event_track installed, put the livechat banner above the PWA banner.
         var pwaBannerHeight = $('.o_pwa_install_banner').outerHeight(true);
         if (pwaBannerHeight) {
             this.$el.css('bottom', pwaBannerHeight + 'px');
diff --git a/addons/test_event_full/__manifest__.py b/addons/test_event_full/__manifest__.py
index 4d6116280a9..8423fc06d7f 100644
--- a/addons/test_event_full/__manifest__.py
+++ b/addons/test_event_full/__manifest__.py
@@ -16,14 +16,11 @@ automatic lead generation, full Online support, ...
         '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',
     ],
diff --git a/addons/test_event_full/tests/common.py b/addons/test_event_full/tests/common.py
index 1e06d1be41c..c93396d8255 100644
--- a/addons/test_event_full/tests/common.py
+++ b/addons/test_event_full/tests/common.py
@@ -7,7 +7,7 @@ from odoo.addons.base.tests.common import HttpCaseWithUserDemo, HttpCaseWithUser
 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
+from odoo.addons.website_event.tests.common import EventDtPatcher
 
 
 class TestEventFullCommon(TestEventCrmCommon, TestSalesCommon, EventDtPatcher, MockVisitor):
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index db44af018fd..a37438c0ed2 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -1,29 +1,45 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Events',
+    'version': '1.1',
     'category': 'Marketing/Events',
     'sequence': 140,
     'summary': 'Publish events, sell tickets',
     'website': 'https://www.odoo.com/page/events',
     'description': "",
-    'depends': ['website', 'website_partner', 'website_mail', 'event'],
+    'depends': [
+        'event',
+        'website',
+        'website_partner',
+        'website_mail',
+    ],
     'data': [
         'data/event_data.xml',
         'views/assets.xml',
         'views/res_config_settings_views.xml',
         'views/event_snippets.xml',
-        'views/event_templates.xml',
-        'views/event_templates_misc_pages.xml',
-        'views/event_templates_registration.xml',
+        'views/event_templates_list.xml',
+        'views/event_templates_page.xml',
+        'views/event_templates_page_registration.xml',
+        'views/event_templates_page_misc.xml',
+        'views/event_templates_widgets.xml',
         'views/website_templates.xml',
-        'views/event_views.xml',
+        'views/event_event_views.xml',
+        'views/event_registration_views.xml',
+        'views/event_type_views.xml',
+        'views/website_event_menu_views.xml',
+        'views/website_visitor_views.xml',
+        'views/event_menus.xml',
         'security/ir.model.access.csv',
         'security/event_security.xml',
     ],
     'demo': [
         'data/res_partner_demo.xml',
-        'data/event_demo.xml'
+        'data/website_visitor_demo.xml',
+        'data/event_demo.xml',
+        'data/event_registration_demo.xml',
     ],
     'application': True,
 }
diff --git a/addons/website_event/controllers/__init__.py b/addons/website_event/controllers/__init__.py
index 65a8c12013d..88cf7794fab 100644
--- a/addons/website_event/controllers/__init__.py
+++ b/addons/website_event/controllers/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 
 from . import main
+from . import community
diff --git a/addons/website_event_track_online/controllers/community.py b/addons/website_event/controllers/community.py
similarity index 72%
rename from addons/website_event_track_online/controllers/community.py
rename to addons/website_event/controllers/community.py
index 2720a94931f..57a8cc4694d 100644
--- a/addons/website_event_track_online/controllers/community.py
+++ b/addons/website_event/controllers/community.py
@@ -1,11 +1,11 @@
 # -*- 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 import http
 from odoo.http import request
 
-class WebsiteEventCommunityController(http.Controller):
+
+class EventCommunityController(http.Controller):
 
     @http.route('/event/<model("event.event"):event>/community', type="http", auth="public", website=True)
     def community(self, event, lang=None, **kwargs):
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 0665dce85bb..c003279c12b 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -345,13 +345,34 @@ class WebsiteEventController(http.Controller):
         return list(registrations.values())
 
     def _create_attendees_from_registration_post(self, event, registration_data):
+        """ Also 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()
+        visitor_values = {}
+
         registrations_to_create = []
         for registration_values in registration_data:
             registration_values['event_id'] = event.id
-            if not registration_values.get('partner_id'):
+            if not registration_values.get('partner_id') and visitor_sudo.partner_id:
+                registration_values['partner_id'] = visitor_sudo.partner_id.id
+            elif not registration_values.get('partner_id'):
                 registration_values['partner_id'] = request.env.user.partner_id.id
+
+            if visitor_sudo:
+                # registration may give a name to the visitor, yay
+                if registration_values.get('name') and not visitor_sudo.name and not visitor_values.get('name'):
+                    visitor_values['name'] = registration_values['name']
+                # update registration based on visitor
+                registration_values['visitor_id'] = visitor_sudo.id
+
             registrations_to_create.append(registration_values)
 
+        if visitor_values:
+            visitor_sudo.write(visitor_values)
+
         return request.env['event.registration'].sudo().create(registrations_to_create)
 
     @http.route(['''/event/<model("event.event"):event>/registration/confirm'''], type='http', auth="public", methods=['POST'], website=True)
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index 85a46feb7a7..a894ec82128 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -41,6 +41,7 @@
     <record id="event.event_1" model="event.event">
         <field name="website_menu" eval="True"/>
         <field name="website_published" eval="True"/>
+        <field name="menu_register_cta" eval="True"/>
         <field name="subtitle">The Great Reno Balloon Race is the world's largest free hot-air ballooning event.</field>
         <field name="cover_properties">{"background-image": "url('/website_event/static/src/img/event_cover_1.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "opacity": "0.4"}</field>
         <field name="description" type="html">
@@ -151,6 +152,7 @@
     <record id="event.event_7" model="event.event">
         <field name="website_menu" eval="True"/>
         <field name="website_published" eval="True"/>
+        <field name="menu_register_cta" eval="True"/>
         <field name="subtitle">Our newest collection will be revealed online! Interact with us on our live streams!</field>
         <field name="cover_properties">{"background-image": "url('/website_event/static/src/img/event_cover_7.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "opacity": "0.4"}</field>
         <field name="description" type="html">
diff --git a/addons/website_event_online/data/event_registration_demo.xml b/addons/website_event/data/event_registration_demo.xml
similarity index 58%
rename from addons/website_event_online/data/event_registration_demo.xml
rename to addons/website_event/data/event_registration_demo.xml
index d89b4d1aabf..ff661e424a9 100644
--- a/addons/website_event_online/data/event_registration_demo.xml
+++ b/addons/website_event/data/event_registration_demo.xml
@@ -3,16 +3,16 @@
 
     <!-- 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"/>
+        <field name="visitor_id" ref="website_event.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"/>
+        <field name="visitor_id" ref="website_event.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"/>
+        <field name="visitor_id" ref="website_event.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"/>
+        <field name="visitor_id" ref="website_event.website_visitor_event_1"/>
     </record>
 
 </data></odoo>
diff --git a/addons/website_event_online/data/website_visitor_demo.xml b/addons/website_event/data/website_visitor_demo.xml
similarity index 92%
rename from addons/website_event_online/data/website_visitor_demo.xml
rename to addons/website_event/data/website_visitor_demo.xml
index 174b1c17b68..8403ae7fb0b 100644
--- a/addons/website_event_online/data/website_visitor_demo.xml
+++ b/addons/website_event/data/website_visitor_demo.xml
@@ -18,7 +18,7 @@
     </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="parent_id" ref="website_event.website_visitor_event_2"/>
         <field name="partner_id" eval="False"/>
         <field name="country_id" ref="base.be"/>
     </record>
diff --git a/addons/website_event/models/__init__.py b/addons/website_event/models/__init__.py
index 67661173e03..cce22a56c9e 100644
--- a/addons/website_event/models/__init__.py
+++ b/addons/website_event/models/__init__.py
@@ -1,4 +1,10 @@
 # -*- 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_type
 from . import website
+from . import website_event_menu
+from . import website_menu
+from . import website_visitor
diff --git a/addons/website_event/models/event_event.py b/addons/website_event/models/event_event.py
index 925aed32996..72f8096b5a1 100644
--- a/addons/website_event/models/event_event.py
+++ b/addons/website_event/models/event_event.py
@@ -1,25 +1,26 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import werkzeug.urls
 import json
+import werkzeug.urls
+
+from pytz import utc
 
 from odoo import api, fields, models, _
 from odoo.addons.http_routing.models.ir_http import slug
+from odoo.osv import expression
 
 GOOGLE_CALENDAR_URL = 'https://www.google.com/calendar/render?'
 
 
-class EventType(models.Model):
-    _name = 'event.type'
-    _inherit = ['event.type']
-
-    website_menu = fields.Boolean('Display a dedicated menu on Website')
-
-
 class Event(models.Model):
     _name = 'event.event'
-    _inherit = ['event.event', 'website.seo.metadata', 'website.published.multi.mixin', 'website.cover_properties.mixin']
+    _inherit = [
+        'event.event',
+        'website.seo.metadata',
+        'website.published.multi.mixin',
+        'website.cover_properties.mixin'
+    ]
 
     def _default_cover_properties(self):
         res = super()._default_cover_properties()
@@ -38,23 +39,68 @@ class Event(models.Model):
         help="Creates menus Introduction, Location and Register on the page "
              "of the event on the website.")
     menu_id = fields.Many2one('website.menu', 'Event Menu', copy=False)
+    menu_register_cta = fields.Boolean(
+        'Add Register Button', compute='_compute_menu_register_cta',
+        readonly=False, store=True)
+    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")])
+    # 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)")
 
     def _compute_is_participating(self):
-        # we don't allow public user to see participating label
-        if self.env.user != self.env['website'].get_current_website().user_id:
-            email = self.env.user.partner_id.email
-            for event in self:
-                domain = ['&', '|', ('email', '=', email), ('partner_id', '=', self.env.user.partner_id.id), ('event_id', '=', event.id)]
-                event.is_participating = self.env['event.registration'].sudo().search_count(domain)
-        else:
-            self.is_participating = False
+        """Heuristic
+
+          * 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
 
-    @api.depends('name')
-    def _compute_website_url(self):
-        super(Event, self)._compute_website_url()
         for event in self:
-            if event.id:  # avoid to perform a slug on a not yet saved record in case of an onchange.
-                event.website_url = '/event/%s' % slug(event)
+            event.is_participating = event in events
 
     @api.depends('event_type_id')
     def _compute_website_menu(self):
@@ -66,6 +112,56 @@ class Event(models.Model):
             elif not event.website_menu:
                 event.website_menu = False
 
+    @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
+
+    @api.depends("event_type_id", "website_menu")
+    def _compute_menu_register_cta(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.menu_register_cta = event.event_type_id.menu_register_cta
+            elif event.website_menu and event.website_menu != event._origin.website_menu or not event.menu_register_cta:
+                event.menu_register_cta = True
+            elif not event.website_menu:
+                event.menu_register_cta = False
+
+    @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
+
+    @api.depends('name')
+    def _compute_website_url(self):
+        super(Event, self)._compute_website_url()
+        for event in self:
+            if event.id:  # avoid to perform a slug on a not yet saved record in case of an onchange.
+                event.website_url = '/event/%s' % slug(event)
+
+    # ------------------------------------------------------------
+    # CRUD
+    # ------------------------------------------------------------
+
     @api.model
     def create(self, vals):
         res = super(Event, self).create(vals)
@@ -93,7 +189,10 @@ class Event(models.Model):
 
         :return list: list of fields, each of which triggering a menu update
           like website_menu, website_track, ... """
-        return ['website_menu']
+        return ['website_menu', 'community_menu']
+
+    def _get_menu_type_field_matching(self):
+        return {'community': 'community_menu'}
 
     def _split_menus_state_by_field(self):
         """ For each field linked to a menu, get the set of events having this
@@ -137,7 +236,7 @@ class Event(models.Model):
                 menus_update_by_field[fname] |= menus_state_by_field[fname]['deactivated'].filtered(lambda event: event[fname])
         return menus_update_by_field
 
-    def _get_menu_entries(self):
+    def _get_website_menu_entries(self):
         """ Method returning menu entries to display on the website view of the
         event, possibly depending on some options in inheriting modules.
 
@@ -145,14 +244,22 @@ class Event(models.Model):
           * 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'),
-            (_('Location'), False, 'website_event.template_location'),
-            (_('Register'), '/event/%s/register' % slug(self), False),
+            (_('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 _get_community_menu_entries(self):
+        self.ensure_one()
+        return [(_('Community'), '/event/%s/community' % slug(self), False, 80, 'community')]
+
     def _update_website_menus(self, menus_update_by_field=None):
         """ Synchronize event configuration and its menu entries for frontend.
 
@@ -163,8 +270,44 @@ class Event(models.Model):
             elif event.website_menu and not event.menu_id:
                 root_menu = self.env['website.menu'].sudo().create({'name': event.name, 'website_id': event.website_id.id})
                 event.menu_id = root_menu
-                for sequence, (name, url, xml_id) in enumerate(event._get_menu_entries()):
-                    event._create_menu(sequence, name, url, xml_id)
+            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_website_menu_entries():
+                    event._create_menu(menu_sequence, name, url, xml_id, menu_type=menu_type)
+            if event.menu_id and (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 _update_website_menu_entry(self, fname_bool, fname_o2m, method_name):
+        """ Generic method to create menu entries based on a flag on event. This
+        method is a bit obscure, but is due to preparation of adding new menus
+        entries and pages for event in a stable version, leading to some constraints
+        while developing.
+
+        :param fname_bool: field name (e.g. website_track)
+        :param fname_o2m: o2m linking towards website.event.menu matching the
+          boolean fields (normally an entry ot website.event.menu with type matching
+          the boolean field name)
+        :param method_name: method returning menu entries information: url, sequence, ...
+        """
+        self.ensure_one()
+        new_menu = None
+
+        if self[fname_bool] and not self[fname_o2m]:
+            # menus not found but boolean True: get menus to create
+            for sequence, menu_data in enumerate(getattr(self, method_name)()):
+                # some modules have 4 data: name, url, xml_id, menu_type; however we
+                # plan to support sequence in future modules, so this hackish code is
+                # necessary to avoid crashing. Not nice, but stable target = meh.
+                if len(menu_data) == 4:
+                    (name, url, xml_id, menu_type) = menu_data
+                    menu_sequence = sequence
+                elif len(menu_data) == 5:
+                    (name, url, xml_id, menu_sequence, menu_type) = menu_data
+                new_menu = self._create_menu(menu_sequence, name, url, xml_id, menu_type=menu_type)
+        elif not self[fname_bool]:
+            # will cascade delete to the website.event.menu
+            self[fname_o2m].mapped('menu_id').sudo().unlink()
+
+        return new_menu
 
     def _create_menu(self, sequence, name, url, xml_id, menu_type=False):
         """ If url: create a website menu. Menu leads directly to the URL that
@@ -186,6 +329,12 @@ class Event(models.Model):
             'sequence': sequence,
             'website_id': self.website_id.id,
         })
+        if menu_type:
+            self.env['website.event.menu'].create({
+                'menu_id': website_menu.id,
+                'event_id': self.id,
+                'menu_type': menu_type,
+            })
         return website_menu
 
     # ------------------------------------------------------------
diff --git a/addons/website_event_online/models/event_registration.py b/addons/website_event/models/event_registration.py
similarity index 100%
rename from addons/website_event_online/models/event_registration.py
rename to addons/website_event/models/event_registration.py
diff --git a/addons/website_event_track_online/models/event_type.py b/addons/website_event/models/event_type.py
similarity index 53%
rename from addons/website_event_track_online/models/event_type.py
rename to addons/website_event/models/event_type.py
index 9b2efc94af8..43acf03360b 100644
--- a/addons/website_event_track_online/models/event_type.py
+++ b/addons/website_event/models/event_type.py
@@ -5,14 +5,24 @@ from odoo import api, fields, models
 
 
 class EventType(models.Model):
-    _inherit = "event.type"
+    _name = 'event.type'
+    _inherit = ['event.type']
 
+    website_menu = fields.Boolean('Display a dedicated menu on Website')
     community_menu = fields.Boolean(
         "Community Menu", compute="_compute_community_menu",
         readonly=False, store=True,
         help="Display community tab on website")
+    menu_register_cta = fields.Boolean(
+        'Add Register Button', compute='_compute_menu_register_cta',
+        readonly=False, store=True)
 
     @api.depends('website_menu')
     def _compute_community_menu(self):
         for event_type in self:
             event_type.community_menu = event_type.website_menu
+
+    @api.depends('website_menu')
+    def _compute_menu_register_cta(self):
+        for event_type in self:
+            event_type.menu_register_cta = event_type.website_menu
diff --git a/addons/website_event/models/website_event_menu.py b/addons/website_event/models/website_event_menu.py
new file mode 100644
index 00000000000..b19c7d8ca75
--- /dev/null
+++ b/addons/website_event/models/website_event_menu.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class EventMenu(models.Model):
+    _name = "website.event.menu"
+    _description = "Website Event Menu"
+
+    menu_id = fields.Many2one('website.menu', string='Menu', ondelete='cascade')
+    event_id = fields.Many2one('event.event', string='Event', ondelete='cascade')
+    menu_type = fields.Selection([
+        ('community', 'Community Menu')], string="Menu Type",
+        ondelete={'community': 'cascade'}, required=True)
diff --git a/addons/website_event/models/website_menu.py b/addons/website_event/models/website_menu.py
new file mode 100644
index 00000000000..1b96cd8552c
--- /dev/null
+++ b/addons/website_event/models/website_menu.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class WebsiteMenu(models.Model):
+    _inherit = "website.menu"
+
+    def unlink(self):
+        """ Override to synchronize event configuration fields with menu deletion.
+        This should be cleaned in upcoming versions. """    
+        event_updates = {}
+        website_event_menus = self.env['website.event.menu'].search([('menu_id', 'in', self.ids)])
+        for event_menu in website_event_menus:
+            to_update = event_updates.setdefault(event_menu.event_id, list())
+            for menu_type, fname in event_menu.event_id._get_menu_type_field_matching().items():
+                if event_menu.menu_type == menu_type:
+                    to_update.append(fname)
+
+        # call super that resumes the unlink of menus entries (including website event menus)
+        res = super(WebsiteMenu, self).unlink()
+
+        # update events
+        for event, to_update in event_updates.items():
+            if to_update:
+                event.write(dict((fname, False) for fname in to_update))
+
+        return res
diff --git a/addons/website_event_online/models/website_visitor.py b/addons/website_event/models/website_visitor.py
similarity index 100%
rename from addons/website_event_online/models/website_visitor.py
rename to addons/website_event/models/website_visitor.py
diff --git a/addons/website_event/security/event_security.xml b/addons/website_event/security/event_security.xml
index 857e758e9c0..1aabb8f3025 100644
--- a/addons/website_event/security/event_security.xml
+++ b/addons/website_event/security/event_security.xml
@@ -12,6 +12,17 @@
         <field name="perm_unlink" eval="False"/>
     </record>
 
+    <record id="ir_rule_event_tag_public" model="ir.rule">
+        <field name="name">Event Tag: public/portal: color = published</field>
+        <field name="model_id" ref="event.model_event_tag"/>
+        <field name="domain_force">['&amp;', ('color', '!=', False), ('color', '!=', 0)]</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>
+
     <record id="ir_rule_event_event_ticket_public" model="ir.rule">
         <field name="name">Event Ticket: public/portal: published read</field>
         <field name="model_id" ref="event.model_event_event_ticket"/>
diff --git a/addons/website_event/security/ir.model.access.csv b/addons/website_event/security/ir.model.access.csv
index 985c14e5190..49125082909 100644
--- a/addons/website_event/security/ir.model.access.csv
+++ b/addons/website_event/security/ir.model.access.csv
@@ -6,3 +6,6 @@ access_event_event_ticket_public,event.event.ticket.public,event.model_event_eve
 access_event_event_ticket_portal,event.event.ticket.portal,event.model_event_event_ticket,base.group_portal,1,0,0,0
 access_event_category_public,event.tag.category.public,event.model_event_tag_category,,1,0,0,0
 access_event_tag_public,event.tag.public,event.model_event_tag,,1,0,0,0
+access_website_event_menu_public,website.event.menu,model_website_event_menu,,1,0,0,0
+access_website_event_menu_manager,website.event.menu,model_website_event_menu,event.group_event_manager,1,1,1,1
+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/static/src/js/display_timer_widget.js
similarity index 98%
rename from addons/website_event_online/static/src/js/display_timer_widget.js
rename to addons/website_event/static/src/js/display_timer_widget.js
index 0ada123c3b0..5f61273661f 100644
--- a/addons/website_event_online/static/src/js/display_timer_widget.js
+++ b/addons/website_event/static/src/js/display_timer_widget.js
@@ -1,4 +1,4 @@
-odoo.define('website_event_online.display_timer_widget', function (require) {
+odoo.define('website_event.display_timer_widget', function (require) {
 'use strict';
 
 var core = require('web.core');
diff --git a/addons/website_event_online/static/src/js/register_toaster_widget.js b/addons/website_event/static/src/js/register_toaster_widget.js
similarity index 90%
rename from addons/website_event_online/static/src/js/register_toaster_widget.js
rename to addons/website_event/static/src/js/register_toaster_widget.js
index 83397e74c40..891f61554c7 100644
--- a/addons/website_event_online/static/src/js/register_toaster_widget.js
+++ b/addons/website_event/static/src/js/register_toaster_widget.js
@@ -1,4 +1,4 @@
-odoo.define('website_event_online.register_toaster_widget', function (require) {
+odoo.define('website_event.register_toaster_widget', function (require) {
 'use strict';
 
 let core = require('web.core');
diff --git a/addons/website_event_online/static/src/scss/website_event_templates.scss b/addons/website_event/static/src/scss/website_event_templates.scss
similarity index 100%
rename from addons/website_event_online/static/src/scss/website_event_templates.scss
rename to addons/website_event/static/src/scss/website_event_templates.scss
diff --git a/addons/website_event/tests/__init__.py b/addons/website_event/tests/__init__.py
index 41f5bb1157f..77fa25d467c 100644
--- a/addons/website_event/tests/__init__.py
+++ b/addons/website_event/tests/__init__.py
@@ -4,5 +4,6 @@
 from . import common
 from . import test_event_internals
 from . import test_ui
+from . import test_visitor_events
 from . import test_website_event
 from . import test_website_event_access
diff --git a/addons/website_event/tests/common.py b/addons/website_event/tests/common.py
index 333a2ed4789..1dbf91c8e49 100644
--- a/addons/website_event/tests/common.py
+++ b/addons/website_event/tests/common.py
@@ -1,8 +1,59 @@
 # -*- 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.addons.mail.tests.common import mail_new_test_user
+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_dt = patch(
+            'odoo.addons.website_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_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_dt = cls.wevent_dt.start()
+        cls.mock_wevent_main_dt = cls.wevent_main_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_dt.now.return_value = cls.reference_now
+        cls.mock_wevent_main_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_dt.stop)
+        cls.addClassCleanup(cls.wevent_main_dt.stop)
+        cls.addClassCleanup(cls.event_date.stop)
+        cls.addClassCleanup(cls.wevent_main_date.stop)
 
 
 class TestWebsiteEventCommon(TestEventCommon):
@@ -43,3 +94,16 @@ class TestWebsiteEventCommon(TestEventCommon):
             # without website.event.menu model (or crappy code based on name)
             # else:
             #     self.assertFalse(bool(view))
+
+
+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/tests/test_event_internals.py b/addons/website_event/tests/test_event_internals.py
index 9e99815fd67..9339da20e6a 100644
--- a/addons/website_event/tests/test_event_internals.py
+++ b/addons/website_event/tests/test_event_internals.py
@@ -17,6 +17,7 @@ class TestEventWebsite(TestWebsiteEventCommon):
             'date_begin': fields.Datetime.to_string(datetime.today() + timedelta(days=1)),
             'date_end': fields.Datetime.to_string(datetime.today() + timedelta(days=15)),
             'website_menu': True,
+            'community_menu': False,
         })
         self._assert_website_menus(event)
 
@@ -27,6 +28,7 @@ class TestEventWebsite(TestWebsiteEventCommon):
             'date_begin': fields.Datetime.to_string(datetime.today() + timedelta(days=1)),
             'date_end': fields.Datetime.to_string(datetime.today() + timedelta(days=15)),
             'website_menu': True,
+            'community_menu': False,
         })
         self.assertTrue(event.website_menu)
         self._assert_website_menus(event)
diff --git a/addons/website_event_online/tests/test_visitor_events.py b/addons/website_event/tests/test_visitor_events.py
similarity index 100%
rename from addons/website_event_online/tests/test_visitor_events.py
rename to addons/website_event/tests/test_visitor_events.py
diff --git a/addons/website_event/views/assets.xml b/addons/website_event/views/assets.xml
index e19a829e3ff..cbf9e23a6bf 100644
--- a/addons/website_event/views/assets.xml
+++ b/addons/website_event/views/assets.xml
@@ -10,8 +10,11 @@
     <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Assets Frontend">
         <xpath expr="//link[last()]" position="after">
             <link rel="stylesheet" type="text/scss" href="/website_event/static/src/scss/website_event.scss"/>
+            <link rel="stylesheet" type="text/scss" href="/website_event/static/src/scss/website_event_templates.scss"/>
         </xpath>
         <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/website_event/static/src/js/display_timer_widget.js"></script>
+            <script type="text/javascript" src="/website_event/static/src/js/register_toaster_widget.js"></script>
             <script type="text/javascript" src="/website_event/static/src/js/website_geolocation.js"></script>
             <script type="text/javascript" src="/website_event/static/src/js/website_event.js"></script>
             <script type="text/javascript" src="/website_event/static/src/js/website_event_ticket_details.js"></script>
diff --git a/addons/website_event/views/event_views.xml b/addons/website_event/views/event_event_views.xml
similarity index 54%
rename from addons/website_event/views/event_views.xml
rename to addons/website_event/views/event_event_views.xml
index e78bee85014..f364ac129c6 100644
--- a/addons/website_event/views/event_views.xml
+++ b/addons/website_event/views/event_event_views.xml
@@ -1,31 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="event_type_view_form_inherit_website" model="ir.ui.view">
-        <field name="name">event.type.view.form.inherit.website</field>
-        <field name="model">event.type</field>
-        <field name="inherit_id" ref="event.view_event_type_form"/>
-        <field name="arch" type="xml">
-            <div name="event_type_visibility_seats" position="after">
-                <div class="col-12 col-lg-6 o_setting_box" name="event_type_visibility_website">
-                    <div class="o_setting_left_pane">
-                        <field name="website_menu"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="website_menu"/>
-                        <div class="row" name="website_menu">
-                            <div class="col-lg-8 mt16 text-muted">
-                                Check this option to have menus for your event on the
-                                website: registrations, schedule, map, ...
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </field>
-    </record>
-
-    <record id="event_event_view_form_inherit_website" model="ir.ui.view">
+    <record id="event_event_view_form" model="ir.ui.view">
         <field name="name">event.event.view.form.inherit.website</field>
         <field name="model">event.event</field>
         <field name="priority" eval="5"/>
@@ -43,10 +19,20 @@
                     type="object"
                     string="Preview Badges"/>
             </xpath>
+            <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"/>
+                    <label for="community_menu" string="Community"/>
+                    <field name="community_menu"/>
+                </div>
+            </xpath>
         </field>
     </record>
 
-    <record id="event_event_view_list_inherit_website" model="ir.ui.view">
+    <record id="event_event_view_list" model="ir.ui.view">
         <field name="name">event.event.view.list.inherit.website</field>
         <field name="model">event.event</field>
         <field name="inherit_id" ref="event.view_event_tree"/>
diff --git a/addons/website_event/views/event_menus.xml b/addons/website_event/views/event_menus.xml
new file mode 100644
index 00000000000..623a223679b
--- /dev/null
+++ b/addons/website_event/views/event_menus.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <menuitem id="menu_website_event_menu"
+        name="Website Menus"
+        action="website_event_menu_action"
+        parent="event.menu_event_configuration"
+        groups="base.group_no_one"
+        sequence="99"/>
+
+</data></odoo>
diff --git a/addons/website_event_online/views/event_registration_views.xml b/addons/website_event/views/event_registration_views.xml
similarity index 100%
rename from addons/website_event_online/views/event_registration_views.xml
rename to addons/website_event/views/event_registration_views.xml
diff --git a/addons/website_event/views/event_snippets.xml b/addons/website_event/views/event_snippets.xml
index 4407b19f7e3..15634348006 100644
--- a/addons/website_event/views/event_snippets.xml
+++ b/addons/website_event/views/event_snippets.xml
@@ -12,40 +12,6 @@
     </div>
 </template>
 
-<!-- Snippet - Country Events - List -->
-<template id="country_events_list" name="Country Events List">
-    <div class="country_events_list">
-        <t t-if="events">
-            <h6 class="o_wevent_sidebar_title">
-                <t t-if="country">
-                    <i class="fa fa-flag mr-2"/>Events: <span t-esc="country.name"/>
-                    <img class="img-fluid" t-att-src="website.image_url(country, 'image')" alt=""/>
-                </t>
-                <t t-else="">
-                    <i class="fa fa-globe mr-2"/>Upcoming Events
-                </t>
-            </h6>
-            <ul class="list-group mb-3">
-                <li t-foreach="events[:5]" t-as="event_dict" class="list-group-item d-flex justify-content-between">
-                    <a t-att-href="event_dict['url']">
-                        <i t-if="not event_dict['event'].website_published" class="fa fa-ban text-danger mr-1" role="img" aria-label="Unpublished" title="Unpublished"/>
-                        <span t-esc="event_dict['event'].name" t-attf-class="#{(not event_dict['event'].website_published) and 'text-danger' or ''}"/>
-                    </a>
-                    <span t-esc="event_dict['date']"/>
-                </li>
-            </ul>
-            <div t-if="len(events) &gt; 5">
-                <t t-if="country">
-                    <a t-attf-href="/event?country=#{country.id}" class="small"><b>See all events from <span t-esc="country.name"/></b></a>
-                </t>
-                <t t-else="">
-                    <a href="/event" class="small"><b>View all</b></a>
-                </t>
-            </div>
-        </t>
-    </div>
-</template>
-
 <!-- Snippets and options -->
 <template id="snippets" inherit_id="website.snippets">
     <xpath expr="//t[@id='event_local_events_hook']" position="replace">
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates_list.xml
similarity index 62%
rename from addons/website_event/views/event_templates.xml
rename to addons/website_event/views/event_templates_list.xml
index d2d5ce204a6..4ad91388abe 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates_list.xml
@@ -97,15 +97,16 @@
 <template id="event_category_tag" inherit_id="website_event.index_topbar" active="False" customize_show="True" name="Filter by Tags">
     <xpath expr="//ul[hasclass('o_wevent_index_topbar_filters')]" position="inside">
         <t t-foreach="categories" t-as="category">
-            <li t-if="category.tag_ids" class="nav-item dropdown mr-2 my-1">
+            <li t-if="category.tag_ids and any(tag.color for tag in 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="category.name"/>
                 </a>
                 <div class="dropdown-menu">
                     <t t-foreach="category.tag_ids" t-as="tag">
-                        <a t-att-href="'/event?%s' % 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 ''}">
+                        <a t-if="tag.color"
+                            t-att-href="'/event?%s' % 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>
@@ -144,23 +145,6 @@
     </xpath>
 </template>
 
-<!-- Search Box -->
-<template id="events_search_box" inherit_id="website.website_search_box" primary="True">
-    <xpath expr="//div[@role='search']" position="replace">
-        <form t-attf-class="o_wevent_event_searchbar_form o_wait_lazy_js w-100 my-1 my-lg-0 #{_classes}"
-              t-att-action="action if action else '/event'" method="get">
-            <t t-set="search" t-value="search or _searches and _searches['search']"/>
-            <t t-set="placeholder" t-value="placeholder or _placeholder"/>
-            <t>$0</t>
-            <t t-foreach="_searches" t-as="search">
-                <input t-if="search != 'search' and search_value != 'all'" type="hidden"
-                    t-att-name="search" t-att-value="search_value"/>
-            </t>
-            <t t-raw="0"/>
-        </form>
-    </xpath>
-</template>
-
 <!-- Index - Events list -->
 <template id="events_list" name="Events list">
     <!-- Options -->
@@ -222,7 +206,8 @@
                             <div itemprop="location" t-field="event.address_id" t-options="{'widget': 'contact', 'fields': ['city'], 'no_marker': 'true'}"/>
                             <div class="mt8 d-flex align-items-center">
                                 <t t-foreach="event.tag_ids" t-as="tag">
-                                    <span t-attf-class="badge mr8 #{'badge-primary' if tag in search_tags else 'badge-light'}">
+                                    <span t-if="tag.color"
+                                        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>
                                 </t>
@@ -343,153 +328,4 @@
     </xpath>
 </template>
 
-<!-- Event -->
-<template id="layout" name="Event">
-    <t t-call="website.layout">
-        <!-- Options -->
-        <t t-set="opt_events_list_categories" t-value="request.website.viewref('website_event.opt_events_list_categories').active"/>
-        <div id="wrap" class="o_wevent_event js_event">
-            <t t-if="not event.menu_id">
-                <nav class="navbar navbar-light border-top shadow-sm d-print-none">
-                    <div class="container align-items-baseline justify-content-start">
-                        <a href="/event" class="navbar-brand h4 my-0 mr-0 mr-md-4">
-                            <i class="fa fa-long-arrow-left text-primary mr-2"/>
-                            <span>All Events</span>
-                        </a>
-                        <ul class="navbar-nav flex-row ml-md-auto ml-0">
-                            <li t-if="opt_events_list_categories" class="nav-item mr-3">
-                                <a t-attf-href="/event?type=#{event.event_type_id.id}" t-if="event.event_type_id" class="nav-link">
-                                    <i class="fa fa-folder-open text-primary mr-2"/><span t-field="event.event_type_id"/>
-                                </a>
-                            </li>
-                            <li class="nav-item mr-3">
-                                <a t-if="event.country_id" t-attf-href="/event?country=#{event.country_id.id}" class="nav-link">
-                                    <i class="fa fa-map-marker text-primary mr-2"/><span t-field="event.country_id"/>
-                                </a>
-                            </li>
-                        </ul>
-                        <div class="d-flex align-items-centerflex-wrap pl-sm-3 pr-0">
-                            <t t-call="website_event.events_search_box">
-                                <t t-set="_classes" t-value="'ml-auto'"/>
-                                <t t-set="_searches" t-value="searches"/>
-                                <t t-set="_placeholder">Search an event ...</t>
-                            </t>
-                        </div>
-                    </div>
-                </nav>
-            </t>
-            <t t-else="">
-                <nav class="navbar navbar-light border-top shadow-sm navbar-expand-md">
-                    <div class="container align-items-baseline">
-                        <a href="#" t-field="event.name" class="navbar-brand h4 my-0 mr-0 mr-md-4"/>
-                        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#o_wevent_event_submenu" aria-controls="o_wevent_event_submenu" aria-expanded="false" aria-label="Toggle navigation">
-                            <span class="navbar-toggler-icon"></span>
-                        </button>
-                        <div id="o_wevent_event_submenu" class="collapse navbar-collapse">
-                            <ul class="navbar-nav w-100" t-att-data-menu_name="editable and 'Event Menu'" t-att-data-content_menu_id="editable and event.menu_id.id">
-                                <t t-foreach="event.menu_id.child_id" t-as="submenu">
-                                    <t t-call="website.submenu">
-                                        <t t-set="item_class" t-value="'nav-item'"/>
-                                        <t t-set="link_class" t-value="'nav-link'"/>
-                                    </t>
-                                </t>
-                            </ul>
-                        </div>
-                    </div>
-                </nav>
-            </t>
-            <t t-raw="0"/>
-            <t t-set="editor_sub_message">Following content will appear on all events.</t>
-            <div class="oe_structure oe_empty" id="oe_structure_website_event_layout_1" t-att-data-editor-sub-message="editor_sub_message"/>
-        </div>
-    </t>
-</template>
-
-<!-- Event - Description -->
-<template id="event_description_full" name="Event Description" track="1">
-    <t t-call="website_event.event_details">
-        <section class="bg-200 mt-n5">
-            <div class="container overflow-hidden">
-                <div class="row no-gutters mt-n4 mb-3">
-                    <!-- Description -->
-                    <div id="o_wevent_event_main_col" class="col-lg-8 bg-white px-3 pt-5 pb-0 shadow-sm">
-                        <span t-field="event.description" itemprop="description"/>
-                    </div>
-                    <div class="col-lg-4 bg-light shadow-sm d-print-none">
-                        <!-- Date & Time -->
-                        <div class="o_wevent_sidebar_block">
-                            <h6 class="o_wevent_sidebar_title">Date &amp; Time</h6>
-                            <div class="d-flex">
-                                <h5 t-field="event.with_context(tz=event.date_tz).date_begin" class="my-1 mr-1" t-options="{'date_only': 'true', 'format': 'EEEE'}"/>
-                                <h5 class="my-1" t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'date_only': 'true', 'format': 'long'}" itemprop="startDate" t-att-datetime="event.date_begin"/>
-                            </div>
-                            <t t-if="not event.is_one_day">Start -</t>
-                            <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'time_only': 'true', 'format': 'short'}"/>
-                            <t t-if="event.is_one_day">
-                                <i class="fa fa-long-arrow-right mx-1"/>
-                                <span t-field="event.with_context(tz=event.date_tz).date_end" t-options="{'time_only': 'true', 'format': 'short'}"/>
-                            </t>
-                            <t t-else="">
-                                <i class="fa fa-long-arrow-down d-block text-muted mx-3 my-2" style="font-size: 1.5rem"/>
-                                <div class="d-flex">
-                                    <h5 t-field="event.with_context(tz=event.date_tz).date_end" class="my-1 mr-1" t-options="{'date_only': 'true', 'format': 'EEEE'}"/>
-                                    <h5 class="my-1" t-field="event.with_context(tz=event.date_tz).date_end" t-options="{'date_only': 'true', 'format': 'long'}"/>
-                                </div>
-                                <t t-if="not event.is_one_day">End -</t>
-                                <span t-field="event.with_context(tz=event.date_tz).date_end" t-options="{'time_only': 'true', 'format': 'short'}"/>
-                            </t>
-                            <!-- Timezone -->
-                            <small t-esc="event.date_tz" class="d-block my-3 text-muted"/>
-
-                            <div class="dropdown">
-                                <i class="fa fa-calendar mr-1"/>
-                                <a href="#" role="button" data-toggle="dropdown">Add to Calendar</a>
-                                <div class="dropdown-menu">
-                                    <a t-att-href="iCal_url" class="dropdown-item">iCal/Outlook</a>
-                                    <a t-att-href="google_url" class="dropdown-item" target="_blank">Google</a>
-                                </div>
-                            </div>
-                        </div>
-                        <!-- Location -->
-                        <div t-if="event.address_id" class="o_wevent_sidebar_block">
-                            <h6 class="o_wevent_sidebar_title">Location</h6>
-                            <h4 t-field="event.address_id" class="" t-options='{
-                                "widget": "contact",
-                                "fields": ["name"]
-                            }'/>
-                            <div itemprop="location" class="mb-2" t-field="event.address_id" t-options='{
-                                "widget": "contact",
-                                "fields": ["address"],
-                                "no_marker": True
-                            }'/>
-                            <div class="mb-3" t-field="event.address_id" t-options='{
-                                "widget": "contact",
-                                "fields": ["phone", "mobile", "email"]
-                            }'/>
-                            <i class="fa fa-map-marker fa-fw" role="img"/>
-                            <a t-att-href="event._google_map_link()" target="_blank">Get the direction</a>
-                        </div>
-                        <!-- Organizer -->
-                        <div t-if="event.organizer_id" class="o_wevent_sidebar_block">
-                            <h6 class="o_wevent_sidebar_title">Organizer</h6>
-                            <h4 t-field="event.organizer_id"/>
-                            <div itemprop="location" t-field="event.organizer_id" t-options="{'widget': 'contact', 'fields': ['phone', 'mobile', 'email']}"/>
-                        </div>
-                        <!-- Social -->
-                        <div class="o_wevent_sidebar_block">
-                            <h6 class="o_wevent_sidebar_title">SHARE</h6>
-                            <p class="mb-2">Find out what people see and say about this event, and join the conversation.</p>
-                            <t t-snippet-call="website.s_share">
-                                <t t-set="_no_title" t-value="True"/>
-                                <t t-set="_classes" t-valuef="o_wevent_sidebar_social mx-n1"/>
-                                <t t-set="_link_classes" t-valuef="o_wevent_social_link"/>
-                            </t>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </t>
-</template>
-
 </odoo>
diff --git a/addons/website_event/views/event_templates_page.xml b/addons/website_event/views/event_templates_page.xml
new file mode 100644
index 00000000000..cc82788c948
--- /dev/null
+++ b/addons/website_event/views/event_templates_page.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Event -->
+<template id="layout" name="Event">
+    <t t-call="website.layout">
+        <!-- Options -->
+        <t t-set="opt_events_list_categories" t-value="request.website.viewref('website_event.opt_events_list_categories').active"/>
+        <div id="wrap" class="o_wevent_event js_event">
+            <t t-if="not event.menu_id">
+                <nav class="navbar navbar-light border-top shadow-sm d-print-none">
+                    <div class="container align-items-baseline justify-content-start">
+                        <a href="/event" class="navbar-brand h4 my-0 mr-0 mr-md-4">
+                            <i class="fa fa-long-arrow-left text-primary mr-2"/>
+                            <span>All Events</span>
+                        </a>
+                        <ul class="navbar-nav flex-row ml-md-auto ml-0">
+                            <li t-if="opt_events_list_categories" class="nav-item mr-3">
+                                <a t-attf-href="/event?type=#{event.event_type_id.id}" t-if="event.event_type_id" class="nav-link">
+                                    <i class="fa fa-folder-open text-primary mr-2"/><span t-field="event.event_type_id"/>
+                                </a>
+                            </li>
+                            <li class="nav-item mr-3">
+                                <a t-if="event.country_id" t-attf-href="/event?country=#{event.country_id.id}" class="nav-link">
+                                    <i class="fa fa-map-marker text-primary mr-2"/><span t-field="event.country_id"/>
+                                </a>
+                            </li>
+                        </ul>
+                        <div class="d-flex align-items-centerflex-wrap pl-sm-3 pr-0">
+                            <t t-call="website_event.events_search_box">
+                                <t t-set="_classes" t-value="'ml-auto'"/>
+                                <t t-set="_searches" t-value="searches"/>
+                                <t t-set="_placeholder">Search an event ...</t>
+                            </t>
+                        </div>
+                    </div>
+                </nav>
+            </t>
+            <t t-else="">
+                <nav class="navbar navbar-light border-top shadow-sm navbar-expand-md">
+                    <div class="container align-items-baseline">
+                        <a href="#" t-field="event.name" class="navbar-brand h4 my-0 mr-0 mr-md-4"/>
+                        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#o_wevent_event_submenu" aria-controls="o_wevent_event_submenu" aria-expanded="false" aria-label="Toggle navigation">
+                            <span class="navbar-toggler-icon"></span>
+                        </button>
+                        <div id="o_wevent_event_submenu" class="collapse navbar-collapse">
+                            <ul class="navbar-nav w-100" t-att-data-menu_name="editable and 'Event Menu'" t-att-data-content_menu_id="editable and event.menu_id.id">
+                                <t t-foreach="event.menu_id.child_id" t-as="submenu">
+                                    <t t-call="website.submenu">
+                                        <t t-set="item_class" t-value="'nav-item'"/>
+                                        <t t-set="link_class" t-value="'nav-link'"/>
+                                    </t>
+                                </t>
+                            </ul>
+                            <!-- Add Register additional CTA button, in addition to menus -->
+                            <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>
+                        </div>
+                    </div>
+                </nav>
+            </t>
+            <t t-raw="0"/>
+            <t t-set="editor_sub_message">Following content will appear on all events.</t>
+            <div class="oe_structure oe_empty" id="oe_structure_website_event_layout_1" t-att-data-editor-sub-message="editor_sub_message"/>
+        </div>
+    </t>
+</template>
+
+</odoo>
diff --git a/addons/website_event/views/event_templates_misc_pages.xml b/addons/website_event/views/event_templates_page_misc.xml
similarity index 100%
rename from addons/website_event/views/event_templates_misc_pages.xml
rename to addons/website_event/views/event_templates_page_misc.xml
diff --git a/addons/website_event/views/event_templates_registration.xml b/addons/website_event/views/event_templates_page_registration.xml
similarity index 76%
rename from addons/website_event/views/event_templates_registration.xml
rename to addons/website_event/views/event_templates_page_registration.xml
index acc8705a9c3..6375b55c293 100644
--- a/addons/website_event/views/event_templates_registration.xml
+++ b/addons/website_event/views/event_templates_page_registration.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+
 <template id="event_details" name="Event Header">
     <t t-call="website_event.layout">
         <div name="event" itemscope="itemscope" itemtype="http://schema.org/Event">
@@ -26,6 +27,93 @@
     </t>
 </template>
 
+<!-- Event - Description -->
+<template id="event_description_full" name="Event Description" track="1">
+    <t t-call="website_event.event_details">
+        <section class="bg-200 mt-n5">
+            <div class="container overflow-hidden">
+                <div class="row no-gutters mt-n4 mb-3">
+                    <!-- Description -->
+                    <div id="o_wevent_event_main_col" class="col-lg-8 bg-white px-3 pt-5 pb-0 shadow-sm">
+                        <span t-field="event.description" itemprop="description"/>
+                    </div>
+                    <div class="col-lg-4 bg-light shadow-sm d-print-none">
+                        <!-- Date & Time -->
+                        <div class="o_wevent_sidebar_block">
+                            <h6 class="o_wevent_sidebar_title">Date &amp; Time</h6>
+                            <div class="d-flex">
+                                <h5 t-field="event.with_context(tz=event.date_tz).date_begin" class="my-1 mr-1" t-options="{'date_only': 'true', 'format': 'EEEE'}"/>
+                                <h5 class="my-1" t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'date_only': 'true', 'format': 'long'}" itemprop="startDate" t-att-datetime="event.date_begin"/>
+                            </div>
+                            <t t-if="not event.is_one_day">Start -</t>
+                            <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'time_only': 'true', 'format': 'short'}"/>
+                            <t t-if="event.is_one_day">
+                                <i class="fa fa-long-arrow-right mx-1"/>
+                                <span t-field="event.with_context(tz=event.date_tz).date_end" t-options="{'time_only': 'true', 'format': 'short'}"/>
+                            </t>
+                            <t t-else="">
+                                <i class="fa fa-long-arrow-down d-block text-muted mx-3 my-2" style="font-size: 1.5rem"/>
+                                <div class="d-flex">
+                                    <h5 t-field="event.with_context(tz=event.date_tz).date_end" class="my-1 mr-1" t-options="{'date_only': 'true', 'format': 'EEEE'}"/>
+                                    <h5 class="my-1" t-field="event.with_context(tz=event.date_tz).date_end" t-options="{'date_only': 'true', 'format': 'long'}"/>
+                                </div>
+                                <t t-if="not event.is_one_day">End -</t>
+                                <span t-field="event.with_context(tz=event.date_tz).date_end" t-options="{'time_only': 'true', 'format': 'short'}"/>
+                            </t>
+                            <!-- Timezone -->
+                            <small t-esc="event.date_tz" class="d-block my-3 text-muted"/>
+
+                            <div class="dropdown">
+                                <i class="fa fa-calendar mr-1"/>
+                                <a href="#" role="button" data-toggle="dropdown">Add to Calendar</a>
+                                <div class="dropdown-menu">
+                                    <a t-att-href="iCal_url" class="dropdown-item">iCal/Outlook</a>
+                                    <a t-att-href="google_url" class="dropdown-item" target="_blank">Google</a>
+                                </div>
+                            </div>
+                        </div>
+                        <!-- Location -->
+                        <div t-if="event.address_id" class="o_wevent_sidebar_block">
+                            <h6 class="o_wevent_sidebar_title">Location</h6>
+                            <h4 t-field="event.address_id" class="" t-options='{
+                                "widget": "contact",
+                                "fields": ["name"]
+                            }'/>
+                            <div itemprop="location" class="mb-2" t-field="event.address_id" t-options='{
+                                "widget": "contact",
+                                "fields": ["address"],
+                                "no_marker": True
+                            }'/>
+                            <div class="mb-3" t-field="event.address_id" t-options='{
+                                "widget": "contact",
+                                "fields": ["phone", "mobile", "email"]
+                            }'/>
+                            <i class="fa fa-map-marker fa-fw" role="img"/>
+                            <a t-att-href="event._google_map_link()" target="_blank">Get the direction</a>
+                        </div>
+                        <!-- Organizer -->
+                        <div t-if="event.organizer_id" class="o_wevent_sidebar_block">
+                            <h6 class="o_wevent_sidebar_title">Organizer</h6>
+                            <h4 t-field="event.organizer_id"/>
+                            <div itemprop="location" t-field="event.organizer_id" t-options="{'widget': 'contact', 'fields': ['phone', 'mobile', 'email']}"/>
+                        </div>
+                        <!-- Social -->
+                        <div class="o_wevent_sidebar_block">
+                            <h6 class="o_wevent_sidebar_title">SHARE</h6>
+                            <p class="mb-2">Find out what people see and say about this event, and join the conversation.</p>
+                            <t t-snippet-call="website.s_share">
+                                <t t-set="_no_title" t-value="True"/>
+                                <t t-set="_classes" t-valuef="o_wevent_sidebar_social mx-n1"/>
+                                <t t-set="_link_classes" t-valuef="o_wevent_social_link"/>
+                            </t>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </t>
+</template>
+
 <!-- Event - Registration -->
 <template id="registration_template" name="Registration">
     <div t-if="request.env.user.has_group('event.group_event_manager')" class="alert alert-info rounded-0 o_website_event_configuration o_not_editable" role="status">
@@ -33,6 +121,7 @@
             <i class="fa fa-pencil mr-2" role="img" aria-label="Edit" title="Edit event registration in backend"/><em>Configure Event Tickets</em>
         </a>
     </div>
+    <div t-if="toast_message" class="o_wevent_register_toaster d-none" t-att-data-message="toast_message"/>
     <div t-if="not event.event_registrations_open" class="bg-white mb-5">
         <div class="alert alert-info mb-0 d-flex justify-content-between align-items-center" role="status">
             <t t-if="event.start_sale_date and event.start_sale_date &gt; datetime.date.today()">
diff --git a/addons/website_event/views/event_templates_widgets.xml b/addons/website_event/views/event_templates_widgets.xml
new file mode 100644
index 00000000000..4b994176bde
--- /dev/null
+++ b/addons/website_event/views/event_templates_widgets.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Search Box -->
+<template id="events_search_box" inherit_id="website.website_search_box" primary="True">
+    <xpath expr="//div[@role='search']" position="replace">
+        <form t-attf-class="o_wevent_event_searchbar_form o_wait_lazy_js w-100 my-1 my-lg-0 #{_classes}"
+              t-att-action="action if action else '/event'" method="get">
+            <t t-set="search" t-value="search or _searches and _searches['search']"/>
+            <t t-set="placeholder" t-value="placeholder or _placeholder"/>
+            <t>$0</t>
+            <t t-foreach="_searches" t-as="search">
+                <input t-if="search != 'search' and search_value != 'all'" type="hidden"
+                    t-att-name="search" t-att-value="search_value"/>
+            </t>
+            <t t-raw="0"/>
+        </form>
+    </xpath>
+</template>
+
+<!-- Snippet - Country Events - List -->
+<template id="country_events_list" name="Country Events List">
+    <div class="country_events_list">
+        <t t-if="events">
+            <h6 class="o_wevent_sidebar_title">
+                <t t-if="country">
+                    <i class="fa fa-flag mr-2"/>Events: <span t-esc="country.name"/>
+                    <img class="img-fluid" t-att-src="website.image_url(country, 'image')" alt=""/>
+                </t>
+                <t t-else="">
+                    <i class="fa fa-globe mr-2"/>Upcoming Events
+                </t>
+            </h6>
+            <ul class="list-group mb-3">
+                <li t-foreach="events[:5]" t-as="event_dict" class="list-group-item d-flex justify-content-between">
+                    <a t-att-href="event_dict['url']">
+                        <i t-if="not event_dict['event'].website_published" class="fa fa-ban text-danger mr-1" role="img" aria-label="Unpublished" title="Unpublished"/>
+                        <span t-esc="event_dict['event'].name" t-attf-class="#{(not event_dict['event'].website_published) and 'text-danger' or ''}"/>
+                    </a>
+                    <span t-esc="event_dict['date']"/>
+                </li>
+            </ul>
+            <div t-if="len(events) &gt; 5">
+                <t t-if="country">
+                    <a t-attf-href="/event?country=#{country.id}" class="small"><b>See all events from <span t-esc="country.name"/></b></a>
+                </t>
+                <t t-else="">
+                    <a href="/event" class="small"><b>View all</b></a>
+                </t>
+            </div>
+        </t>
+    </div>
+</template>
+
+<!-- Timer widget -->
+<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>
+
+</odoo>
diff --git a/addons/website_event/views/event_type_views.xml b/addons/website_event/views/event_type_views.xml
new file mode 100644
index 00000000000..60d09caee79
--- /dev/null
+++ b/addons/website_event/views/event_type_views.xml
@@ -0,0 +1,39 @@
+<?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.website</field>
+        <field name="model">event.type</field>
+        <field name="inherit_id" ref="event.view_event_type_form"/>
+        <field name="arch" type="xml">
+            <div name="event_type_visibility_seats" position="after">
+                <div class="col-12 col-lg-6 o_setting_box" name="event_type_visibility_website">
+                    <div class="o_setting_left_pane">
+                        <field name="website_menu"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="website_menu"/>
+                        <div class="row" name="website_menu">
+                            <div class="col-lg-8 mt16 text-muted">
+                                Check this option to have menus for your event on the
+                                website: registrations, schedule, map, ...
+                            </div>
+                        </div>
+                        <div class="row mt16" name="menu_register_cta"
+                            groups="base.group_no_one"
+                            attrs="{'invisible': [('website_menu', '=', False)]}">
+                            <label class="col-lg-4" for="menu_register_cta"/> <field name="menu_register_cta"/>
+                        </div>
+                        <div class="row mt16" name="community_menu"
+                            id="community-menu"
+                            groups="base.group_no_one"
+                            attrs="{'invisible': [('website_menu', '=', False)]}">
+                            <label class="col-lg-4" for="community_menu"/> <field name="community_menu"/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track/views/website_event_menu_views.xml b/addons/website_event/views/website_event_menu_views.xml
similarity index 100%
rename from addons/website_event_track/views/website_event_menu_views.xml
rename to addons/website_event/views/website_event_menu_views.xml
diff --git a/addons/website_event_online/views/website_visitor_views.xml b/addons/website_event/views/website_visitor_views.xml
similarity index 96%
rename from addons/website_event_online/views/website_visitor_views.xml
rename to addons/website_event/views/website_visitor_views.xml
index a7b4af81adf..471ab75f07b 100644
--- a/addons/website_event_online/views/website_visitor_views.xml
+++ b/addons/website_event/views/website_visitor_views.xml
@@ -29,7 +29,7 @@
         <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"
+                <button name="%(website_event.event_registration_action_from_visitor)d"
                     type="action"
                     class="oe_stat_button" icon="fa-ticket"
                     attrs="{'invisible': [('event_registration_count', '=', 0)]}">
diff --git a/addons/website_event_meet/__manifest__.py b/addons/website_event_meet/__manifest__.py
index ee97ff02819..b4367b72ea5 100644
--- a/addons/website_event_meet/__manifest__.py
+++ b/addons/website_event_meet/__manifest__.py
@@ -11,11 +11,7 @@
     '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_event',
         'website_jitsi',
     ],
     'demo': ['data/website_event_meet_demo.xml'],
diff --git a/addons/website_event_meet/controllers/community.py b/addons/website_event_meet/controllers/community.py
index c653b9fa9f9..291a6017dfc 100644
--- a/addons/website_event_meet/controllers/community.py
+++ b/addons/website_event_meet/controllers/community.py
@@ -8,13 +8,13 @@ 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.addons.website_event.controllers.community import EventCommunityController
 from odoo.osv import expression
 
 _logger = logging.getLogger(__name__)
 
 
-class WebsiteEventMeetController(WebsiteEventCommunityController):
+class WebsiteEventMeetController(EventCommunityController):
 
     def _get_event_rooms_base_domain(self, event):
         search_domain_base = [('event_id', '=', event.id), ('is_published', '=', True)]
diff --git a/addons/website_event_meet/models/website_event_menu.py b/addons/website_event_meet/models/website_event_menu.py
index 827d3bc1fa4..0902dde05f2 100644
--- a/addons/website_event_meet/models/website_event_menu.py
+++ b/addons/website_event_meet/models/website_event_menu.py
@@ -7,4 +7,6 @@ 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")])
+    menu_type = fields.Selection(
+        selection_add=[("meeting_room", "Event Meeting Room Menus")],
+        ondelete={'meeting_room': 'cascade'})
diff --git a/addons/website_event_meet/views/event_event_views.xml b/addons/website_event_meet/views/event_event_views.xml
index 08d5c46e86b..798be072310 100644
--- a/addons/website_event_meet/views/event_event_views.xml
+++ b/addons/website_event_meet/views/event_event_views.xml
@@ -4,7 +4,7 @@
     <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="inherit_id" ref="website_event.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">
diff --git a/addons/website_event_meet/views/event_type_views.xml b/addons/website_event_meet/views/event_type_views.xml
index 8e76e97f4d6..616206d9418 100644
--- a/addons/website_event_meet/views/event_type_views.xml
+++ b/addons/website_event_meet/views/event_type_views.xml
@@ -3,7 +3,7 @@
     <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="inherit_id" ref="website_event.event_type_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='website_menu']" position='after'>
                 <div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
diff --git a/addons/website_event_meet_quiz/controllers/community.py b/addons/website_event_meet_quiz/controllers/community.py
index 5086a9e1881..231e548befb 100644
--- a/addons/website_event_meet_quiz/controllers/community.py
+++ b/addons/website_event_meet_quiz/controllers/community.py
@@ -1,14 +1,14 @@
 # -*- 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
 
+from odoo import http
+from odoo.addons.website_event.controllers.community import EventCommunityController
+from odoo.http import request
 
-class WebsiteEventTrackQuizMeetController(WebsiteEventCommunityController):
+
+class WebsiteEventTrackQuizMeetController(EventCommunityController):
 
     @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):
diff --git a/addons/website_event_online/__init__.py b/addons/website_event_online/__init__.py
deleted file mode 100644
index 5a31f331a2a..00000000000
--- a/addons/website_event_online/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- 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
deleted file mode 100644
index d391ea3346b..00000000000
--- a/addons/website_event_online/__manifest__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- 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',
-        'security/event_security.xml',
-        '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',
-        'views/event_templates_widgets.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
deleted file mode 100644
index 20ce9ac3fb4..00000000000
--- a/addons/website_event_online/controllers/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- 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
deleted file mode 100644
index a504f1000f1..00000000000
--- a/addons/website_event_online/controllers/event_registration.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- 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
deleted file mode 100644
index ff2bde98b40..00000000000
--- a/addons/website_event_online/data/event_demo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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_tag_demo.xml b/addons/website_event_online/data/event_tag_demo.xml
deleted file mode 100644
index 391eb867aa6..00000000000
--- a/addons/website_event_online/data/event_tag_demo.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/models/__init__.py b/addons/website_event_online/models/__init__.py
deleted file mode 100644
index e6dbdc4c033..00000000000
--- a/addons/website_event_online/models/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- 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
deleted file mode 100644
index 05064c3b929..00000000000
--- a/addons/website_event_online/models/event_event.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# -*- 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_tag.py b/addons/website_event_online/models/event_tag.py
deleted file mode 100644
index 71aa5c63004..00000000000
--- a/addons/website_event_online/models/event_tag.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from random import randint
-
-from odoo import models, fields
-
-
-class EventTag(models.Model):
-    _inherit = ['event.tag']
-
-    def _default_color(self):
-        return randint(1, 11)
-
-    color = fields.Integer(
-        string='Color Index', default=lambda self: self._default_color(),
-        help='Tag color. No color means no display in kanban or front-end, to distinguish internal tags from public categorization tags.')
diff --git a/addons/website_event_online/security/event_security.xml b/addons/website_event_online/security/event_security.xml
deleted file mode 100644
index d7e1c0d29cb..00000000000
--- a/addons/website_event_online/security/event_security.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo><data noupdate="1">
-
-    <record id="ir_rule_event_tag_public" model="ir.rule">
-        <field name="name">Event Tag: public/portal: color = published</field>
-        <field name="model_id" ref="event.model_event_tag"/>
-        <field name="domain_force">['&amp;', ('color', '!=', False), ('color', '!=', 0)]</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>
-
-</data></odoo>
diff --git a/addons/website_event_online/security/ir.model.access.csv b/addons/website_event_online/security/ir.model.access.csv
deleted file mode 100644
index 20948d77e58..00000000000
--- a/addons/website_event_online/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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/tests/__init__.py b/addons/website_event_online/tests/__init__.py
deleted file mode 100644
index 7599117c507..00000000000
--- a/addons/website_event_online/tests/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- 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
deleted file mode 100644
index 58f1779a6af..00000000000
--- a/addons/website_event_online/tests/common.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- 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/views/assets.xml b/addons/website_event_online/views/assets.xml
deleted file mode 100644
index f90e1d77168..00000000000
--- a/addons/website_event_online/views/assets.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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
deleted file mode 100644
index 4ed754e39b0..00000000000
--- a/addons/website_event_online/views/event_event_views.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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_tag_views.xml b/addons/website_event_online/views/event_tag_views.xml
deleted file mode 100644
index ebaffa264c0..00000000000
--- a/addons/website_event_online/views/event_tag_views.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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
deleted file mode 100644
index 4c7407faadb..00000000000
--- a/addons/website_event_online/views/event_templates_event.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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>
-
-<!-- Support tag colors -->
-<template id="events_list" name="Events List (Online)"
-    inherit_id="website_event.events_list">
-    <xpath expr="//t[@t-foreach='event.tag_ids']/span" position="replace">
-        <span t-if="tag.color" 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>
-
-<template id="event_category_tag" name="Filter by Tags (Online)"
-    inherit_id="website_event.event_category_tag">
-    <xpath expr="//t[@t-foreach='categories']" position="replace">
-        <t t-foreach="categories" t-as="category">
-            <li t-if="category.tag_ids and any(tag.color for tag in 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="category.name"/>
-                </a>
-                <div class="dropdown-menu">
-                    <t t-foreach="category.tag_ids" t-as="tag">
-                        <a t-if="tag.color"
-                            t-att-href="'/event?%s' % 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>
-
-<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_templates_widgets.xml b/addons/website_event_online/views/event_templates_widgets.xml
deleted file mode 100644
index 43c60b64545..00000000000
--- a/addons/website_event_online/views/event_templates_widgets.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<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>
-
-</odoo>
diff --git a/addons/website_event_online/views/event_type_views.xml b/addons/website_event_online/views/event_type_views.xml
deleted file mode 100644
index b87ae0c0107..00000000000
--- a/addons/website_event_online/views/event_type_views.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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_questions/views/event_views.xml b/addons/website_event_questions/views/event_views.xml
index d42565f51b2..7b92e292d94 100644
--- a/addons/website_event_questions/views/event_views.xml
+++ b/addons/website_event_questions/views/event_views.xml
@@ -3,7 +3,7 @@
     <record id="event_type_view_form_inherit_question" model="ir.ui.view">
         <field name="name">event.type.view.form.inherit.question</field>
         <field name="model">event.type</field>
-        <field name="inherit_id" ref="website_event.event_type_view_form_inherit_website"/>
+        <field name="inherit_id" ref="website_event.event_type_view_form"/>
         <field name="arch" type="xml">
             <div name="event_type_attendees_auto_confirm" position="after">
                 <div class="col-12 col-lg-12 o_setting_box">
@@ -28,10 +28,10 @@
         </field>
     </record>
 
-    <record id="event_event_view_form_inherit_question" model="ir.ui.view">
+    <record id="event_event_view_form" model="ir.ui.view">
         <field name="name">event.event.view.form.inherit.question</field>
         <field name="model">event.event</field>
-        <field name="inherit_id" ref="website_event.event_event_view_form_inherit_website"/>
+        <field name="inherit_id" ref="website_event.event_event_view_form"/>
         <field name="arch" type="xml">
             <data>
                 <page name="event_notes" position="before">
diff --git a/addons/website_event_track/__manifest__.py b/addons/website_event_track/__manifest__.py
index 05b5c676ec1..74618521e33 100644
--- a/addons/website_event_track/__manifest__.py
+++ b/addons/website_event_track/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Advanced Events',
     'category': 'Marketing',
     'summary': 'Sponsors, Tracks, Agenda, Event News',
-    'version': '1.0',
+    'version': '1.1',
     'description': "",
     'depends': ['website_event'],
     'data': [
@@ -13,18 +13,33 @@
         'security/event_track_security.xml',
         'data/event_data.xml',
         'data/event_track_data.xml',
-        'views/event_track_templates.xml',
+        'views/assets.xml',
+        'views/event_templates.xml',
+        'views/event_track_templates_agenda.xml',
+        'views/event_track_templates_list.xml',
+        'views/event_track_templates_misc.xml',
+        'views/event_track_templates_reminder.xml',
+        'views/event_track_templates_page.xml',
+        'views/event_track_templates_proposal.xml',
+        'views/website_templates.xml',
         'views/event_track_views.xml',
+        'views/event_track_location_views.xml',
+        'views/event_track_tag_views.xml',
+        'views/event_track_stage_views.xml',
+        'views/event_track_visitor_views.xml',
         'views/event_sponsor_views.xml',
-        'views/event_views.xml',
-        'views/website_event_menu_views.xml',
+        'views/event_event_views.xml',
+        'views/event_type_views.xml',
+        'views/website_visitor_views.xml',
         'views/event_menus.xml',
     ],
     'demo': [
         'data/event_demo.xml',
         'data/event_sponsor_demo.xml',
-        'data/event_track_demo_misc.xml',
+        'data/event_track_location_demo.xml',
+        'data/event_track_tag_demo.xml',
         'data/event_track_demo.xml',
         'data/event_track_demo_description.xml',
+        'data/event_track_visitor_demo.xml',
     ],
 }
diff --git a/addons/website_event_track/controllers/__init__.py b/addons/website_event_track/controllers/__init__.py
index 5d4b25db9c0..8779baf6109 100644
--- a/addons/website_event_track/controllers/__init__.py
+++ b/addons/website_event_track/controllers/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import main
+from . import event_track
+from . import webmanifest
diff --git a/addons/website_event_track/controllers/event_track.py b/addons/website_event_track/controllers/event_track.py
new file mode 100644
index 00000000000..782b1e839ee
--- /dev/null
+++ b/addons/website_event_track/controllers/event_track.py
@@ -0,0 +1,477 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from ast import literal_eval
+from datetime import timedelta
+from pytz import timezone, utc
+from werkzeug.exceptions import Forbidden, NotFound
+
+import babel
+import babel.dates
+import base64
+import pytz
+
+from odoo import exceptions, http, fields, _
+from odoo.http import request
+from odoo.osv import expression
+from odoo.tools import is_html_empty, plaintext2html
+
+
+class EventTrackController(http.Controller):
+
+    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),
+        ]
+        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
+
+    # ------------------------------------------------------------
+    # TRACK LIST VIEW
+    # ------------------------------------------------------------
+
+    @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_session",
+            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: announced, live, soon and day-based
+        tracks_announced = tracks_sudo.filtered(lambda track: not track.date)
+        tracks_wdate = tracks_sudo - tracks_announced
+        date_begin_tz_all = list(set(
+            dt.date()
+            for dt in self._get_dt_in_event_tz(tracks_wdate.mapped('date'), event)
+        ))
+        date_begin_tz_all.sort()
+        tracks_sudo_live = tracks_wdate.filtered(lambda track: track.is_published and track.is_track_live)
+        tracks_sudo_soon = tracks_wdate.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_tracks = tracks_wdate.filtered(lambda track: self._get_dt_in_event_tz([track.date], event)[0].date() == display_date)
+            tracks_by_day.append({'date': display_date, 'name': display_date, 'tracks': matching_tracks})
+        if tracks_announced:
+            tracks_announced = tracks_announced.sorted('wishlisted_by_default', reverse=True)
+            tracks_by_day.append({'date': False, 'name': _('Coming soon'), 'tracks': tracks_announced})
+
+        # 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'),
+        }
+
+    # ------------------------------------------------------------
+    # AGENDA VIEW
+    # ------------------------------------------------------------
+
+    @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.agenda_online", vals)
+
+    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
+        }
+
+    def _event_agenda_get_tracks(self, event):
+        tracks_sudo = event.sudo().track_ids.filtered(lambda track: track.date)
+        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 _get_locale_time(self, dt_time, lang_code):
+        """ Get locale time from datetime object
+
+            :param dt_time: datetime object
+            :param lang_code: language code (eg. en_US)
+        """
+        locale = babel.Locale.parse(lang_code)
+        return babel.dates.format_time(dt_time, format='short', locale=locale)
+
+    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
+
+    # ------------------------------------------------------------
+    # TRACK PAGE VIEW
+    # ------------------------------------------------------------
+
+    @http.route('''/event/<model("event.event", "[('website_track', '=', True)]"):event>/track/<model("event.track", "[('event_id', '=', event.id)]"):track>''',
+                type='http', auth="public", website=True, sitemap=True)
+    def event_track_page(self, event, track, **options):
+        track = self._fetch_track(track.id, allow_is_accepted=False)
+
+        return request.render(
+            "website_event_track.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'),
+        }
+
+    @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
+
+    # ------------------------------------------------------------
+    # TRACK PROPOSAL
+    # ------------------------------------------------------------
+
+    @http.route(['''/event/<model("event.event"):event>/track_proposal'''], type='http', auth="public", website=True, sitemap=False)
+    def event_track_proposal(self, event, **post):
+        if not event.can_access_from_current_website():
+            raise NotFound()
+
+        return request.render("website_event_track.event_track_proposal", {'event': event, 'main_object': event})
+
+    @http.route(['''/event/<model("event.event"):event>/track_proposal/post'''], type='http', auth="public", methods=['POST'], website=True)
+    def event_track_proposal_post(self, event, **post):
+        if not event.can_access_from_current_website():
+            raise NotFound()
+
+        tags = []
+        for tag in event.allowed_track_tag_ids:
+            if post.get('tag_' + str(tag.id)):
+                tags.append(tag.id)
+
+        track = request.env['event.track'].sudo().create({
+            'name': post['track_name'],
+            'partner_name': post['partner_name'],
+            'partner_email': post['email_from'],
+            'partner_phone': post['phone'],
+            'partner_biography': plaintext2html(post['biography']),
+            'event_id': event.id,
+            'tag_ids': [(6, 0, tags)],
+            'user_id': False,
+            'description': plaintext2html(post['description']),
+            'image': base64.b64encode(post['image'].read()) if post.get('image') else False
+        })
+        if request.env.user != request.website.user_id:
+            track.sudo().message_subscribe(partner_ids=request.env.user.partner_id.ids)
+        else:
+            partner = request.env['res.partner'].sudo().search([('email', '=', post['email_from'])])
+            if partner:
+                track.sudo().message_subscribe(partner_ids=partner.ids)
+        return request.render("website_event_track.event_track_proposal", {'track': track, 'event': event})
+
+    # ------------------------------------------------------------
+    # TOOLS
+    # ------------------------------------------------------------
+
+    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
+
+    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/controllers/main.py b/addons/website_event_track/controllers/main.py
deleted file mode 100644
index 7618ecb3998..00000000000
--- a/addons/website_event_track/controllers/main.py
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import babel
-import babel.dates
-import collections
-import datetime
-import pytz
-import base64
-from werkzeug.exceptions import NotFound
-
-from odoo import fields, http
-from odoo.http import request
-from odoo.tools import plaintext2html, html2plaintext
-
-
-class WebsiteEventTrackController(http.Controller):
-
-    @http.route(['''/event/<model("event.event"):event>/track/<model("event.track", "[('event_id','=',event.id)]"):track>'''], type='http', auth="public", website=True, sitemap=True)
-    def event_track_view(self, event, track, **post):
-        if not event.can_access_from_current_website():
-            raise NotFound()
-
-        track = track.sudo().with_context(tz=event.date_tz or 'UTC')
-        values = {'track': track, 'event': track.event_id, 'main_object': track}
-        return request.render("website_event_track.track_view", values)
-
-    def _get_locale_time(self, dt_time, lang_code):
-        """ Get locale time from datetime object
-
-            :param dt_time: datetime object
-            :param lang_code: language code (eg. en_US)
-        """
-        locale = babel.Locale.parse(lang_code)
-        return babel.dates.format_time(dt_time, format='short', locale=locale)
-
-    def _prepare_calendar(self, event, event_track_ids):
-        local_tz = pytz.timezone(event.date_tz or 'UTC')
-        lang_code = request.env.context.get('lang')
-        locations = {}                  # { location: [track, start_date, end_date, rowspan]}
-        dates = []                      # [ (date, {}) ]
-        for track in event_track_ids:
-            locations.setdefault(track.location_id or False, [])
-
-        forcetr = True
-        for track in event_track_ids:
-            start_date = fields.Datetime.from_string(track.date).replace(tzinfo=pytz.utc).astimezone(local_tz)
-            end_date = start_date + datetime.timedelta(hours=(track.duration or 0.5))
-            location = track.location_id or False
-            locations.setdefault(location, [])
-
-            # New TR, align all events
-            if forcetr or (start_date>dates[-1][0]) or not location:
-                formatted_time = self._get_locale_time(start_date, lang_code)
-                dates.append((start_date, {}, bool(location), formatted_time))
-                for loc in list(locations):
-                    if locations[loc] and (locations[loc][-1][2] > start_date):
-                        locations[loc][-1][3] += 1
-                    elif not locations[loc] or locations[loc][-1][2] <= start_date:
-                        locations[loc].append([False, locations[loc] and locations[loc][-1][2] or dates[0][0], start_date, 1])
-                        dates[-1][1][loc] = locations[loc][-1]
-                forcetr = not bool(location)
-
-            # Add event
-            if locations[location] and locations[location][-1][1] > start_date:
-                locations[location][-1][3] -= 1
-            locations[location].append([track, start_date, end_date, 1])
-            dates[-1][1][location] = locations[location][-1]
-            locations = collections.OrderedDict(sorted(locations.items(), key=lambda t: t[0].id if t[0] else 0))
-        return {
-            'locations': locations,
-            'dates': dates
-        }
-
-    @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')
-        local_tz = pytz.timezone(event.date_tz or 'UTC')
-        days_tracks = collections.defaultdict(lambda: [])
-        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)
-            days_tracks[str(date)[:10]].append(track)
-
-        days = {}
-        tracks_by_days = {}
-        for day, tracks in days_tracks.items():
-            tracks_by_days[day] = tracks
-            days[day] = self._prepare_calendar(event, tracks)
-
-        return request.render("website_event_track.agenda", {
-            'event': event,
-            'main_object': event,
-            'days': days,
-            'tracks_by_days': tracks_by_days,
-            '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>'''
-    ], type='http', auth="public", website=True, sitemap=False)
-    def event_tracks(self, event, tag=None, **post):
-        if not event.can_access_from_current_website() or (tag and tag.color == 0):
-            raise NotFound()
-
-        event = event.with_context(tz=event.date_tz or 'UTC')
-        searches = {}
-        if tag:
-            searches.update(tag=tag.id)
-            tracks = event.track_ids.filtered(lambda track: tag in track.tag_ids)
-        else:
-            tracks = event.track_ids
-
-        values = {
-            'event': event,
-            'main_object': event,
-            'tracks': tracks,
-            'tags': event.tracks_tag_ids,
-            'searches': searches,
-            'html2plaintext': html2plaintext
-        }
-        return request.render("website_event_track.tracks", values)
-
-    @http.route(['''/event/<model("event.event"):event>/track_proposal'''], type='http', auth="public", website=True, sitemap=False)
-    def event_track_proposal(self, event, **post):
-        if not event.can_access_from_current_website():
-            raise NotFound()
-
-        return request.render("website_event_track.event_track_proposal", {'event': event, 'main_object': event})
-
-    @http.route(['''/event/<model("event.event"):event>/track_proposal/post'''], type='http', auth="public", methods=['POST'], website=True)
-    def event_track_proposal_post(self, event, **post):
-        if not event.can_access_from_current_website():
-            raise NotFound()
-
-        tags = []
-        for tag in event.allowed_track_tag_ids:
-            if post.get('tag_' + str(tag.id)):
-                tags.append(tag.id)
-
-        track = request.env['event.track'].sudo().create({
-            'name': post['track_name'],
-            'partner_name': post['partner_name'],
-            'partner_email': post['email_from'],
-            'partner_phone': post['phone'],
-            'partner_biography': plaintext2html(post['biography']),
-            'event_id': event.id,
-            'tag_ids': [(6, 0, tags)],
-            'user_id': False,
-            'description': plaintext2html(post['description']),
-            'image': base64.b64encode(post['image'].read()) if post.get('image') else False
-        })
-        if request.env.user != request.website.user_id:
-            track.sudo().message_subscribe(partner_ids=request.env.user.partner_id.ids)
-        else:
-            partner = request.env['res.partner'].sudo().search([('email', '=', post['email_from'])])
-            if partner:
-                track.sudo().message_subscribe(partner_ids=partner.ids)
-        return request.render("website_event_track.event_track_proposal", {'track': track, 'event': event})
diff --git a/addons/website_event_track/controllers/webmanifest.py b/addons/website_event_track/controllers/webmanifest.py
new file mode 100644
index 00000000000..a777ff10303
--- /dev/null
+++ b/addons/website_event_track/controllers/webmanifest.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import json
+import pytz
+
+from odoo import http
+from odoo.addons.http_routing.models.ir_http import url_for
+from odoo.http import request
+from odoo.modules.module import get_module_resource
+from odoo.tools import ustr
+from odoo.tools.translate import _
+
+
+class TrackManifest(http.Controller):
+
+    @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': url_for('/event'),
+            'start_url': url_for('/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', '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', url_for('/event')),
+        ])
+        return response
diff --git a/addons/website_event_track/data/event_track_data.xml b/addons/website_event_track/data/event_track_data.xml
index 6b1084be59d..33cf0fb5fad 100644
--- a/addons/website_event_track/data/event_track_data.xml
+++ b/addons/website_event_track/data/event_track_data.xml
@@ -33,14 +33,17 @@
         <record id="event_sponsor_type1" model="event.sponsor.type">
             <field name="name">Bronze</field>
             <field name="sequence">3</field>
+            <field name="display_ribbon_style">Bronze</field>
         </record>
         <record id="event_sponsor_type2" model="event.sponsor.type">
             <field name="name">Silver</field>
             <field name="sequence">2</field>
+            <field name="display_ribbon_style">Silver</field>
         </record>
         <record id="event_sponsor_type3" model="event.sponsor.type">
             <field name="name">Gold</field>
             <field name="sequence">1</field>
+            <field name="display_ribbon_style">Gold</field>
         </record>
 
         <record id="event_track_stage0" model="event.track.stage">
@@ -58,15 +61,19 @@
             <field name="name">Announced</field>
             <field name="sequence">3</field>
             <field name="color">3</field>
+            <field name="is_accepted" eval="True"/>
         </record>
         <record id="event_track_stage3" model="event.track.stage">
             <field name="name">Published</field>
             <field name="sequence">4</field>
+            <field name="color">4</field>
+            <field name="is_accepted" eval="True"/>
             <field name="is_done" eval="True"/>
         </record>
         <record id="event_track_stage4" model="event.track.stage">
             <field name="name">Refused</field>
             <field name="sequence">5</field>
+            <field name="color">5</field>
             <field name="fold" eval="True"/>
         </record>
         <record id="event_track_stage5" model="event.track.stage">
diff --git a/addons/website_event_track/data/event_track_demo.xml b/addons/website_event_track/data/event_track_demo.xml
index 62e6f0a7af5..71308eb0736 100644
--- a/addons/website_event_track/data/event_track_demo.xml
+++ b/addons/website_event_track/data/event_track_demo.xml
@@ -333,6 +333,7 @@
         <field name="color">1</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
+        <field name="wishlisted_by_default" eval="True"/>
         <field name="date" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 06:00:00')"></field>
         <field name="tag_ids" eval="[
             (4, ref('website_event_track.event_track_tag1')),
@@ -343,6 +344,10 @@
         <field name="duration">2</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_15"/>
+        <field name="website_cta" eval="True"/>
+        <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="event_7_track_2" model="event.track">
         <field name="name">First Day Wrapup</field>
@@ -386,6 +391,10 @@
         <field name="duration">2</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_15"/>
+        <field name="website_cta" eval="True"/>
+        <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>
     <!-- Location 2 -->
     <record id="event_7_track_5" model="event.track">
@@ -474,6 +483,7 @@
         <field name="color">1</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
+        <field name="wishlisted_by_default" eval="True"/>
         <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 06:00:00')"></field>
         <field name="tag_ids" eval="[
             (4, ref('website_event_track.event_track_tag1')),
@@ -519,6 +529,7 @@
         <field name="color">2</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
+        <field name="wishlisted_by_default" eval="True"/>
         <field name="location_id" ref="website_event_track.event_track_location_online_1"/>
         <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 12:00:00')"></field>
         <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag3'))]"/>
@@ -572,6 +583,7 @@
         <field name="color">7</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
+        <field name="wishlisted_by_default" eval="True"/>
         <field name="location_id" ref="website_event_track.event_track_location_online_2"/>
         <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 13:30:00')"></field>
         <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag1')), (4, ref('website_event_track.event_track_tag12'))]"/>
diff --git a/addons/website_event_track/data/event_track_demo_misc.xml b/addons/website_event_track/data/event_track_location_demo.xml
similarity index 53%
rename from addons/website_event_track/data/event_track_demo_misc.xml
rename to addons/website_event_track/data/event_track_location_demo.xml
index 0819d6a53f1..13629bedc8a 100644
--- a/addons/website_event_track/data/event_track_demo_misc.xml
+++ b/addons/website_event_track/data/event_track_location_demo.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="website_event_track.event_track_stage2" model="event.track.stage">
-        <field name="color">0</field>
-    </record>
-
-    <record id="event_track_tag1" model="event.track.tag">
-        <field name="name">Consumers</field>
-        <field name="color">1</field>
-    </record>
-    <record id="event_track_tag2" model="event.track.tag">
-        <field name="name">Sales</field>
-        <field name="color">2</field>
-    </record>
-    <record id="event_track_tag3" model="event.track.tag">
-        <field name="name">Research</field>
-        <field name="color">3</field>
-    </record>
-    <record id="event_track_tag11" model="event.track.tag">
-        <field name="name">Lightning Talks</field>
-        <field name="color">4</field>
-    </record>
-    <record id="event_track_tag12" model="event.track.tag">
-        <field name="name">Round Table</field>
-        <field name="color">5</field>
-    </record>
-    <record id="event_track_tag13" model="event.track.tag">
-        <field name="name">Keynote</field>
-        <field name="color">6</field>
-    </record>
 
     <record id="event_track_location5" model="event.track.location">
         <field name="name">Le Foyer du lac</field>
diff --git a/addons/website_event_track/data/event_track_tag_demo.xml b/addons/website_event_track/data/event_track_tag_demo.xml
new file mode 100644
index 00000000000..bffa1d6cd05
--- /dev/null
+++ b/addons/website_event_track/data/event_track_tag_demo.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <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="event_track_tag1" model="event.track.tag">
+        <field name="name">Consumers</field>
+        <field name="color">1</field>
+        <field name="category_id" ref="event_track_tag_category_1"/>
+        <field name="sequence">1</field>
+    </record>
+    <record id="event_track_tag2" model="event.track.tag">
+        <field name="name">Sales</field>
+        <field name="color">2</field>
+        <field name="category_id" ref="event_track_tag_category_1"/>
+        <field name="sequence">2</field>
+    </record>
+    <record id="event_track_tag3" model="event.track.tag">
+        <field name="name">Research</field>
+        <field name="color">3</field>
+        <field name="category_id" ref="event_track_tag_category_1"/>
+        <field name="sequence">3</field>
+    </record>
+    <record id="event_track_tag11" model="event.track.tag">
+        <field name="name">Lightning Talks</field>
+        <field name="color">4</field>
+        <field name="category_id" ref="event_track_tag_category_2"/>
+        <field name="sequence">11</field>
+    </record>
+    <record id="event_track_tag12" model="event.track.tag">
+        <field name="name">Round Table</field>
+        <field name="color">5</field>
+        <field name="category_id" ref="event_track_tag_category_2"/>
+        <field name="sequence">12</field>
+    </record>
+    <record id="event_track_tag13" model="event.track.tag">
+        <field name="name">Keynote</field>
+        <field name="color">6</field>
+        <field name="category_id" ref="event_track_tag_category_2"/>
+        <field name="sequence">13</field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_online/data/event_track_visitor_demo.xml b/addons/website_event_track/data/event_track_visitor_demo.xml
similarity index 74%
rename from addons/website_event_track_online/data/event_track_visitor_demo.xml
rename to addons/website_event_track/data/event_track_visitor_demo.xml
index 3217d3ce709..b343ae4f282 100644
--- a/addons/website_event_track_online/data/event_track_visitor_demo.xml
+++ b/addons/website_event_track/data/event_track_visitor_demo.xml
@@ -3,12 +3,12 @@
 
     <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="visitor_id" ref="website_event.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="visitor_id" ref="website_event.website_visitor_event_2"/>
         <field name="is_wishlisted" eval="True"/>
     </record>
 
diff --git a/addons/website_event_track/models/__init__.py b/addons/website_event_track/models/__init__.py
index 8c9ebaa937e..a9c5599582c 100644
--- a/addons/website_event_track/models/__init__.py
+++ b/addons/website_event_track/models/__init__.py
@@ -3,7 +3,15 @@
 
 from . import event_event
 from . import event_sponsor
+from . import event_sponsor_type
 from . import event_track
+from . import event_track_location
 from . import event_track_stage
+from . import event_track_tag
+from . import event_track_tag_category
+from . import event_track_visitor
+from . import event_type
+from . import website
 from . import website_event_menu
 from . import website_menu
+from . import website_visitor
diff --git a/addons/website_event_track/models/event_event.py b/addons/website_event_track/models/event_event.py
index 7759a0e4a5c..7d7dc086077 100644
--- a/addons/website_event_track/models/event_event.py
+++ b/addons/website_event_track/models/event_event.py
@@ -5,24 +5,6 @@ from odoo import api, fields, models, _
 from odoo.addons.http_routing.models.ir_http import slug
 
 
-class EventType(models.Model):
-    _inherit = 'event.type'
-
-    website_track = fields.Boolean(
-        string='Tracks on Website', compute='_compute_website_menu_data',
-        readonly=False, store=True)
-    website_track_proposal = fields.Boolean(
-        string='Tracks Proposals on Website', compute='_compute_website_menu_data',
-        readonly=False, store=True)
-
-    @api.depends('website_menu')
-    def _compute_website_menu_data(self):
-        """ Simply activate or de-activate all menus at once. """
-        for event_type in self:
-            event_type.website_track = event_type.website_menu
-            event_type.website_track_proposal = event_type.website_menu
-
-
 class Event(models.Model):
     _inherit = "event.event"
 
@@ -103,53 +85,10 @@ class Event(models.Model):
             if (not menus_update_by_field) or (event in menus_update_by_field.get('website_track_proposal')):
                 event._update_website_menu_entry('website_track_proposal', 'track_proposal_menu_ids', '_get_track_proposal_menu_entries')
 
-    def _update_website_menu_entry(self, fname_bool, fname_o2m, method_name):
-        """ Generic method to create menu entries based on a flag on event. This
-        method is a bit obscure, but is due to preparation of adding new menus
-        entries and pages for event in a stable version, leading to some constraints
-        while developing.
-
-        :param fname_bool: field name (e.g. website_track)
-        :param fname_o2m: o2m linking towards website.event.menu matching the
-          boolean fields (normally an entry ot website.event.menu with type matching
-          the boolean field name)
-        :param method_name: method returning menu entries information: url, sequence, ...
-        """
-        self.ensure_one()
-        new_menu = None
-
-        if self[fname_bool] and not self[fname_o2m]:
-            # menus not found but boolean True: get menus to create
-            for sequence, menu_data in enumerate(getattr(self, method_name)()):
-                # some modules have 4 data: name, url, xml_id, menu_type; however we
-                # plan to support sequence in future modules, so this hackish code is
-                # necessary to avoid crashing. Not nice, but stable target = meh.
-                if len(menu_data) == 4:
-                    (name, url, xml_id, menu_type) = menu_data
-                    menu_sequence = sequence
-                elif len(menu_data) == 5:
-                    (name, url, xml_id, menu_sequence, menu_type) = menu_data
-                new_menu = self._create_menu(menu_sequence, name, url, xml_id, menu_type=menu_type)
-        elif not self[fname_bool]:
-            # will cascade delete to the website.event.menu
-            self[fname_o2m].mapped('menu_id').sudo().unlink()
-
-        return new_menu
-
-    def _create_menu(self, sequence, name, url, xml_id, menu_type=False):
-        """ Override menu creation from website_event to link a website.event.menu
-        to the newly create menu (either page and url). """
-        website_menu = super(Event, self)._create_menu(sequence, name, url, xml_id, menu_type=menu_type)
-        if menu_type:
-            self.env['website.event.menu'].create({
-                'menu_id': website_menu.id,
-                'event_id': self.id,
-                'menu_type': menu_type,
-            })
-        return website_menu
-
     def _get_menu_type_field_matching(self):
-        return {'track_proposal': 'website_track_proposal'}
+        res = super(Event, self)._get_menu_type_field_matching()
+        res['track_proposal'] = 'website_track_proposal'
+        return res
 
     def _get_track_menu_entries(self):
         """ Method returning menu entries to display on the website view of the
@@ -164,10 +103,11 @@ class Event(models.Model):
         """
         self.ensure_one()
         return [
-            (_('Talks'), '/event/%s/track' % slug(self), False, 'track'),
-            (_('Agenda'), '/event/%s/agenda' % slug(self), False, False)]
+            (_('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, 'track_proposal')]
+        return [(_('Talk Proposals'), '/event/%s/track_proposal' % slug(self), False, 15, 'track_proposal')]
diff --git a/addons/website_event_track/models/event_sponsor.py b/addons/website_event_track/models/event_sponsor.py
index b272618c8d2..0fca8a53a07 100644
--- a/addons/website_event_track/models/event_sponsor.py
+++ b/addons/website_event_track/models/event_sponsor.py
@@ -2,36 +2,40 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import api, fields, models, _
-
-
-class SponsorType(models.Model):
-    _name = "event.sponsor.type"
-    _description = 'Event Sponsor Type'
-    _order = "sequence"
-
-    name = fields.Char('Sponsor Type', required=True, translate=True)
-    sequence = fields.Integer('Sequence')
+from odoo.modules.module import get_resource_path
 
 
 class Sponsor(models.Model):
     _name = "event.sponsor"
     _description = 'Event Sponsor'
     _order = "sequence, sponsor_type_id"
-    _rec_name = 'partner_name'
+    _rec_name = 'name'
     _inherit = ['mail.thread', 'mail.activity.mixin']
 
     event_id = fields.Many2one('event.event', 'Event', required=True)
     sponsor_type_id = fields.Many2one('event.sponsor.type', 'Sponsoring Type', required=True)
+    url = fields.Char('Sponsor Website', compute='_compute_url', readonly=False, store=True)
+    sequence = fields.Integer('Sequence')
+    active = fields.Boolean(default=True)
+    # contact information
     partner_id = fields.Many2one('res.partner', 'Sponsor/Customer', required=True)
     partner_name = fields.Char('Name', related='partner_id.name')
     partner_email = fields.Char('Email', related='partner_id.email')
     partner_phone = fields.Char('Phone', related='partner_id.phone')
     partner_mobile = fields.Char('Mobile', related='partner_id.mobile')
-    url = fields.Char('Sponsor Website', compute='_compute_url', readonly=False, store=True)
-    sequence = fields.Integer('Sequence')
-    image_128 = fields.Image(
-        string="Logo", related='partner_id.image_128', store=True, readonly=False)
-    active = fields.Boolean(default=True)
+    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_url(self):
@@ -39,6 +43,47 @@ class Sponsor(models.Model):
             if sponsor.partner_id.website or not sponsor.url:
                 sponsor.url = sponsor.partner_id.website
 
+    @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]
+
+    # ------------------------------------------------------------
+    # MESSAGING
+    # ------------------------------------------------------------
+
     def _message_get_suggested_recipients(self):
         recipients = super(Sponsor, self)._message_get_suggested_recipients()
         for sponsor in self:
diff --git a/addons/website_event_track_online/models/event_sponsor_type.py b/addons/website_event_track/models/event_sponsor_type.py
similarity index 63%
rename from addons/website_event_track_online/models/event_sponsor_type.py
rename to addons/website_event_track/models/event_sponsor_type.py
index dc5d0355841..8eb3eb71fbd 100644
--- a/addons/website_event_track_online/models/event_sponsor_type.py
+++ b/addons/website_event_track/models/event_sponsor_type.py
@@ -5,8 +5,12 @@ from odoo import fields, models
 
 
 class SponsorType(models.Model):
-    _inherit = "event.sponsor.type"
+    _name = "event.sponsor.type"
+    _description = 'Event Sponsor Type'
+    _order = "sequence"
 
+    name = fields.Char('Sponsor Type', required=True, translate=True)
+    sequence = fields.Integer('Sequence')
     display_ribbon_style = fields.Selection([
         ('no_ribbon', 'No Ribbon'),
         ('Gold', 'Gold'),
diff --git a/addons/website_event_track/models/event_track.py b/addons/website_event_track/models/event_track.py
index 6e0bde1d589..9c44d2d290d 100644
--- a/addons/website_event_track/models/event_track.py
+++ b/addons/website_event_track/models/event_track.py
@@ -2,37 +2,14 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from datetime import timedelta
+from pytz import utc
 from random import randint
 
 from odoo import api, fields, models
-from odoo.tools.translate import _, html_translate
 from odoo.addons.http_routing.models.ir_http import slug
-
-
-class TrackTag(models.Model):
-    _name = "event.track.tag"
-    _description = 'Event Track Tag'
-    _order = 'name'
-
-    def _default_color(self):
-        return randint(1, 11)
-
-    name = fields.Char('Tag Name', required=True)
-    track_ids = fields.Many2many('event.track', string='Tracks')
-    color = fields.Integer(
-        string='Color Index', default=lambda self: self._default_color(),
-        help="Note that colorless tags won't be available on the website.")
-
-    _sql_constraints = [
-        ('name_uniq', 'unique (name)', "Tag name already exists !"),
-    ]
-
-
-class TrackLocation(models.Model):
-    _name = "event.track.location"
-    _description = 'Event Track Location'
-
-    name = fields.Char('Location', required=True)
+from odoo.osv import expression
+from odoo.tools.mail import is_html_empty
+from odoo.tools.translate import _, html_translate
 
 
 class Track(models.Model):
@@ -45,10 +22,36 @@ class Track(models.Model):
     def _get_default_stage_id(self):
         return self.env['event.track.stage'].search([], limit=1).id
 
+    # description
     name = fields.Char('Title', required=True, translate=True)
+    event_id = fields.Many2one('event.event', 'Event', required=True)
     active = fields.Boolean(default=True)
     user_id = fields.Many2one('res.users', 'Responsible', tracking=True, default=lambda self: self.env.user)
     company_id = fields.Many2one('res.company', related='event_id.company_id')
+    tag_ids = fields.Many2many('event.track.tag', string='Tags')
+    description = fields.Html(translate=html_translate, sanitize_attributes=False, sanitize_form=False)
+    color = fields.Integer('Color')
+    priority = fields.Selection([
+        ('0', 'Low'), ('1', 'Medium'),
+        ('2', 'High'), ('3', 'Highest')],
+        'Priority', required=True, default='1')
+    # management
+    stage_id = fields.Many2one(
+        'event.track.stage', string='Stage', ondelete='restrict',
+        index=True, copy=False, default=_get_default_stage_id,
+        group_expand='_read_group_stage_ids',
+        required=True, tracking=True)
+    is_accepted = fields.Boolean('Is Accepted', related='stage_id.is_accepted', readonly=True)
+    kanban_state = fields.Selection([
+        ('normal', 'Grey'),
+        ('done', 'Green'),
+        ('blocked', 'Red')], string='Kanban State',
+        copy=False, default='normal', required=True, tracking=True,
+        help="A track's kanban state indicates special situations affecting it:\n"
+             " * Grey is the default situation\n"
+             " * Red indicates something is preventing the progress of this track\n"
+             " * Green indicates the track is ready to be pulled to the next stage")
+    # speaker
     partner_id = fields.Many2one('res.partner', 'Speaker')
     partner_name = fields.Char(
         string='Name', compute='_compute_partner_info',
@@ -59,34 +62,79 @@ class Track(models.Model):
     partner_phone = fields.Char(
         string='Phone', compute='_compute_partner_info',
         readonly=False, store=True, tracking=30)
-    partner_biography = fields.Html(string='Biography')
-    tag_ids = fields.Many2many('event.track.tag', string='Tags')
-    stage_id = fields.Many2one(
-        'event.track.stage', string='Stage', ondelete='restrict',
-        index=True, copy=False, default=_get_default_stage_id,
-        group_expand='_read_group_stage_ids',
-        required=True, tracking=True)
-    kanban_state = fields.Selection([
-        ('normal', 'Grey'),
-        ('done', 'Green'),
-        ('blocked', 'Red')], string='Kanban State',
-        copy=False, default='normal', required=True, tracking=True,
-        help="A track's kanban state indicates special situations affecting it:\n"
-             " * Grey is the default situation\n"
-             " * Red indicates something is preventing the progress of this track\n"
-             " * Green indicates the track is ready to be pulled to the next stage")
-    description = fields.Html(translate=html_translate, sanitize_attributes=False, sanitize_form=False)
+    partner_biography = fields.Html(
+        string='Biography', compute='_compute_partner_biography',
+        readonly=False, store=True)
+    partner_function = fields.Char(
+        'Job Position', related='partner_id.function',
+        compute_sudo=True, readonly=True)
+    partner_company_name = fields.Char(
+        'Company Name', related='partner_id.parent_name',
+        compute_sudo=True, readonly=True)
+    image = fields.Image(
+        string="Speaker Photo", compute="_compute_speaker_image",
+        readonly=False, store=True,
+        max_width=256, max_height=256)
+    location_id = fields.Many2one('event.track.location', 'Location')
+    # time information
     date = fields.Datetime('Track Date')
     date_end = fields.Datetime('Track End Date', compute='_compute_end_date', store=True)
     duration = fields.Float('Duration', default=1.5, help="Track duration in hours.")
-    location_id = fields.Many2one('event.track.location', 'Location')
-    event_id = fields.Many2one('event.event', 'Event', required=True)
-    color = fields.Integer('Color')
-    priority = fields.Selection([
-        ('0', 'Low'), ('1', 'Medium'),
-        ('2', 'High'), ('3', 'Highest')],
-        'Priority', required=True, default='1')
-    image = fields.Image("Image", max_width=128, max_height=128)
+    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)")
+    # 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.""")
+    # 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 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('name')
     def _compute_website_url(self):
@@ -95,6 +143,8 @@ class Track(models.Model):
             if track.id:
                 track.website_url = '/event/%s/track/%s' % (slug(track.event_id), slug(track))
 
+    # SPEAKER
+
     @api.depends('partner_id')
     def _compute_partner_info(self):
         for track in self:
@@ -103,6 +153,23 @@ class Track(models.Model):
                 track.partner_email = track.partner_id.email
                 track.partner_phone = track.partner_id.phone
 
+    @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
+
+    # TIME
+
     @api.depends('date', 'duration')
     def _compute_end_date(self):
         for track in self:
@@ -112,8 +179,136 @@ class Track(models.Model):
             else:
                 track.date_end = False
 
+
+    # 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)]
+
+    # TIME
+
+    @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
+
+    # ------------------------------------------------------------
+    # CRUD
+    # ------------------------------------------------------------
+
     @api.model_create_multi
     def create(self, vals_list):
+        for values in vals_list:
+            if values.get('website_cta_url'):
+                values['website_cta_url'] = self.env['res.partner']._clean_website(values['website_cta_url'])
+
         tracks = super(Track, self).create(vals_list)
 
         for track in tracks:
@@ -123,12 +318,18 @@ class Track(models.Model):
                 subject=track.name,
                 subtype_id=self.env.ref('website_event_track.mt_event_track').id,
             )
+            track._synchronize_with_stage(track.stage_id)
 
         return tracks
 
     def write(self, vals):
+        if vals.get('website_cta_url'):
+            vals['website_cta_url'] = self.env['res.partner']._clean_website(vals['website_cta_url'])
         if 'stage_id' in vals and 'kanban_state' not in vals:
             vals['kanban_state'] = 'normal'
+        if vals.get('stage_id'):
+            stage = self.env['event.track.stage'].browse(vals['stage_id'])
+            self._synchronize_with_stage(stage)
         res = super(Track, self).write(vals)
         if vals.get('partner_id'):
             self.message_subscribe([vals['partner_id']])
@@ -139,6 +340,14 @@ class Track(models.Model):
         """ Always display all stages """
         return stages.search([], order=order)
 
+    def _synchronize_with_stage(self, stage):
+        if stage.is_done:
+            self.is_published = True
+
+    # ------------------------------------------------------------
+    # MESSAGING
+    # ------------------------------------------------------------
+
     def _track_template(self, changes):
         res = super(Track, self)._track_template(changes)
         track = self[0]
@@ -180,6 +389,10 @@ class Track(models.Model):
                 ]).write({'partner_id': new_partner.id})
         return super(Track, self)._message_post_after_hook(message, msg_vals)
 
+    # ------------------------------------------------------------
+    # ACTION
+    # ------------------------------------------------------------
+
     def open_track_speakers_list(self):
         return {
             'name': _('Speakers'),
@@ -189,3 +402,91 @@ class Track(models.Model):
             'view_id': False,
             'type': 'ir.actions.act_window',
         }
+
+    def get_backend_menu_id(self):
+        return self.env.ref('event.event_main_menu').id
+
+    # ------------------------------------------------------------
+    # 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
+
+    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]
diff --git a/addons/website_event_track/models/event_track_location.py b/addons/website_event_track/models/event_track_location.py
new file mode 100644
index 00000000000..4c56e8370fe
--- /dev/null
+++ b/addons/website_event_track/models/event_track_location.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 TrackLocation(models.Model):
+    _name = "event.track.location"
+    _description = 'Event Track Location'
+
+    name = fields.Char('Location', required=True)
diff --git a/addons/website_event_track/models/event_track_stage.py b/addons/website_event_track/models/event_track_stage.py
index 022237db4f5..9e1a177c0f3 100644
--- a/addons/website_event_track/models/event_track_stage.py
+++ b/addons/website_event_track/models/event_track_stage.py
@@ -18,6 +18,12 @@ class TrackStage(models.Model):
     fold = fields.Boolean(
         string='Folded in Kanban',
         help='This stage is folded in the kanban view when there are no records in that stage to display.')
-    is_done = fields.Boolean(string='Done Stage')
+    is_accepted = fields.Boolean(
+        string='Accepted Stage',
+        help='Accepted tracks are displayed in agenda views but not accessible.')
+    is_done = fields.Boolean(
+        string='Done Stage',
+        help='Done tracks are automatically published so that they are available in frontend.')
     is_cancel = fields.Boolean(string='Canceled Stage')
+    is_done = fields.Boolean()
     color = fields.Integer(string='Color')
diff --git a/addons/website_event_track/models/event_track_tag.py b/addons/website_event_track/models/event_track_tag.py
new file mode 100644
index 00000000000..6efcba1e138
--- /dev/null
+++ b/addons/website_event_track/models/event_track_tag.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from random import randint
+
+from odoo import fields, models
+
+
+class TrackTag(models.Model):
+    _name = "event.track.tag"
+    _description = 'Event Track Tag'
+    _order = "category_id, sequence, name"
+
+    def _default_color(self):
+        return randint(1, 11)
+
+    name = fields.Char('Tag Name', required=True)
+    track_ids = fields.Many2many('event.track', string='Tracks')
+    color = fields.Integer(
+        string='Color Index', default=lambda self: self._default_color(),
+        help="Note that colorless tags won't be available on the website.")
+    sequence = fields.Integer('Sequence', default=10)
+    category_id = fields.Many2one('event.track.tag.category', string="Category", ondelete="set null")
+
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', "Tag name already exists !"),
+    ]
diff --git a/addons/website_event_track_online/models/event_track_tag.py b/addons/website_event_track/models/event_track_tag_category.py
similarity index 64%
rename from addons/website_event_track_online/models/event_track_tag.py
rename to addons/website_event_track/models/event_track_tag_category.py
index b04fb7bf251..05f14e7abed 100644
--- a/addons/website_event_track_online/models/event_track_tag.py
+++ b/addons/website_event_track/models/event_track_tag_category.py
@@ -12,11 +12,3 @@ class TrackTagCategory(models.Model):
     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/models/event_track_visitor.py
similarity index 100%
rename from addons/website_event_track_online/models/event_track_visitor.py
rename to addons/website_event_track/models/event_track_visitor.py
diff --git a/addons/website_event_track/models/event_type.py b/addons/website_event_track/models/event_type.py
new file mode 100644
index 00000000000..23be845275f
--- /dev/null
+++ b/addons/website_event_track/models/event_type.py
@@ -0,0 +1,22 @@
+# -*- 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'
+
+    website_track = fields.Boolean(
+        string='Tracks on Website', compute='_compute_website_menu_data',
+        readonly=False, store=True)
+    website_track_proposal = fields.Boolean(
+        string='Tracks Proposals on Website', compute='_compute_website_menu_data',
+        readonly=False, store=True)
+
+    @api.depends('website_menu')
+    def _compute_website_menu_data(self):
+        """ Simply activate or de-activate all menus at once. """
+        for event_type in self:
+            event_type.website_track = event_type.website_menu
+            event_type.website_track_proposal = event_type.website_menu
diff --git a/addons/website_event_track_online/models/website.py b/addons/website_event_track/models/website.py
similarity index 100%
rename from addons/website_event_track_online/models/website.py
rename to addons/website_event_track/models/website.py
diff --git a/addons/website_event_track/models/website_event_menu.py b/addons/website_event_track/models/website_event_menu.py
index aa00003a58a..70561b0a28a 100644
--- a/addons/website_event_track/models/website_event_menu.py
+++ b/addons/website_event_track/models/website_event_menu.py
@@ -5,12 +5,8 @@ from odoo import fields, models
 
 
 class EventMenu(models.Model):
-    _name = "website.event.menu"
-    _description = "Website Event Menu"
+    _inherit = "website.event.menu"
 
-    menu_id = fields.Many2one('website.menu', string='Menu', ondelete='cascade')
-    event_id = fields.Many2one('event.event', string='Event', ondelete='cascade')
-    menu_type = fields.Selection([
-        ('track', 'Event Tracks Menus'),
-        ('track_proposal', 'Event Proposals Menus'),
-    ])
+    menu_type = fields.Selection(
+        selection_add=[('track', 'Event Tracks Menus'), ('track_proposal', 'Event Proposals Menus')],
+        ondelete={'track': 'cascade', 'track_proposal': 'cascade'})
diff --git a/addons/website_event_track/models/website_menu.py b/addons/website_event_track/models/website_menu.py
index 72377d4e7ce..703c3afbe8d 100644
--- a/addons/website_event_track/models/website_menu.py
+++ b/addons/website_event_track/models/website_menu.py
@@ -18,9 +18,6 @@ class WebsiteMenu(models.Model):
             # agenda page that has also menu_type='track'
             if event_menu.menu_type == 'track' and '/track' in event_menu.menu_id.url:
                 to_update.append('website_track')
-            for menu_type, fname in event_menu.event_id._get_menu_type_field_matching().items():
-                if event_menu.menu_type == menu_type:
-                    to_update.append(fname)
 
         # call super that resumes the unlink of menus entries (including website event menus)
         res = super(WebsiteMenu, self).unlink()
diff --git a/addons/website_event_track_online/models/website_visitor.py b/addons/website_event_track/models/website_visitor.py
similarity index 100%
rename from addons/website_event_track_online/models/website_visitor.py
rename to addons/website_event_track/models/website_visitor.py
diff --git a/addons/website_event_track/security/ir.model.access.csv b/addons/website_event_track/security/ir.model.access.csv
index a3c950c9457..0cc16c6a31b 100644
--- a/addons/website_event_track/security/ir.model.access.csv
+++ b/addons/website_event_track/security/ir.model.access.csv
@@ -12,5 +12,7 @@ access_event_track_sponsor_manager,event.track.sponsor.type.public,model_event_s
 access_event_track_sponsor_public,event.track.sponsor.public,model_event_sponsor,,1,0,0,0
 access_event_track_stage_all,event.track.stage.all,model_event_track_stage,,1,0,0,0
 access_event_track_stage_event_manager,event.track.stage.event.manager,model_event_track_stage,event.group_event_manager,1,1,1,1
-access_website_event_menu_public,website.event.menu,model_website_event_menu,,1,0,0,0
-access_website_event_menu_manager,website.event.menu,model_website_event_menu,event.group_event_manager,1,1,1,1
+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
\ No newline at end of file
diff --git a/addons/website_event_track_online/static/lib/idb-keyval/idb-keyval.js b/addons/website_event_track/static/lib/idb-keyval/idb-keyval.js
similarity index 100%
rename from addons/website_event_track_online/static/lib/idb-keyval/idb-keyval.js
rename to addons/website_event_track/static/lib/idb-keyval/idb-keyval.js
diff --git a/addons/website_event_track_online/static/src/js/event_track_reminder.js b/addons/website_event_track/static/src/js/event_track_reminder.js
similarity index 100%
rename from addons/website_event_track_online/static/src/js/event_track_reminder.js
rename to addons/website_event_track/static/src/js/event_track_reminder.js
diff --git a/addons/website_event_track_online/static/src/js/service_worker.js b/addons/website_event_track/static/src/js/service_worker.js
similarity index 98%
rename from addons/website_event_track_online/static/src/js/service_worker.js
rename to addons/website_event_track/static/src/js/service_worker.js
index ac1a8249a15..a994c2123c4 100644
--- a/addons/website_event_track_online/static/src/js/service_worker.js
+++ b/addons/website_event_track/static/src/js/service_worker.js
@@ -1,4 +1,4 @@
-importScripts("/website_event_track_online/static/lib/idb-keyval/idb-keyval.js");
+importScripts("/website_event_track/static/lib/idb-keyval/idb-keyval.js");
 
 const PREFIX = "odoo-event";
 const SYNCABLE_ROUTES = ["/event/track/toggle_reminder"];
diff --git a/addons/website_event_track_online/static/src/js/website_event_pwa_widget.js b/addons/website_event_track/static/src/js/website_event_pwa_widget.js
similarity index 97%
rename from addons/website_event_track_online/static/src/js/website_event_pwa_widget.js
rename to addons/website_event_track/static/src/js/website_event_pwa_widget.js
index 77d12e4bb1b..00c2a8ede33 100644
--- a/addons/website_event_track_online/static/src/js/website_event_pwa_widget.js
+++ b/addons/website_event_track/static/src/js/website_event_pwa_widget.js
@@ -1,4 +1,4 @@
-odoo.define("website_event_track_online.website_event_pwa_widget", function (require) {
+odoo.define("website_event_track.website_event_pwa_widget", function (require) {
     "use strict";
 
     var config = require("web.config");
@@ -6,7 +6,7 @@ odoo.define("website_event_track_online.website_event_pwa_widget", function (req
     var utils = require("web.utils");
 
     var PWAInstallBanner = publicWidget.Widget.extend({
-        xmlDependencies: ["/website_event_track_online/static/src/xml/website_event_pwa.xml"],
+        xmlDependencies: ["/website_event_track/static/src/xml/website_event_pwa.xml"],
         template: "pwa_install_banner",
         events: {
             "click .o_btn_install": "_onClickInstall",
diff --git a/addons/website_event_track/static/src/js/website_event_track_set_customize_options.js b/addons/website_event_track/static/src/js/website_event_track_set_customize_options.js
deleted file mode 100644
index c193b16b0c6..00000000000
--- a/addons/website_event_track/static/src/js/website_event_track_set_customize_options.js
+++ /dev/null
@@ -1,94 +0,0 @@
-odoo.define('website_event_track.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/static/src/xml/customize_options.xml',
-        ]),
-
-    events: _.extend({}, EventSpecificOptions.prototype.events, {
-        'change #display-showcase-talks': '_onDisplayTalksChange',
-        'change #allow-talk-proposal': '_onAllowTalkProposalChange',
-    }),
-
-    start: function () {
-        this.$displayTalksInput = this.$('#display-showcase-talks');
-        this.$allowTalksInput = this.$('#allow-talk-proposal');
-        this._super.apply(this, arguments);
-    },
-
-    //--------------------------------------------------------------------------
-    // Handlers
-    //--------------------------------------------------------------------------
-
-    _onAllowTalkProposalChange: function () {
-        var checkboxValue = this.$allowTalksInput.is(':checked');
-        this._toggleTalkProposal(checkboxValue);
-    },
-
-    _onDisplayTalksChange: function () {
-        var checkboxValue = this.$displayTalksInput.is(':checked');
-        this._toggleDisplayTalks(checkboxValue);
-    },
-
-    //--------------------------------------------------------------------------
-    // Private
-    //--------------------------------------------------------------------------
-
-    _getCheckboxFields: function () {
-        var fields = this._super();
-        fields = _.union(fields, ['website_track', 'website_track_proposal']);
-        return fields;
-    },
-
-    _getCheckboxFieldMatch: function (checkboxField) {
-        if (checkboxField === 'website_track') {
-            return this.$displayTalksInput;
-        }
-        if (checkboxField === 'website_track_proposal') {
-            return this.$allowTalksInput;
-        }
-        return this._super(checkboxField);
-    },
-
-    _initCheckboxCallback: function (rpcData) {
-        this._super(rpcData);
-        var submenuInput;
-        if (rpcData[0]['website_track']) {
-            submenuInput = this._getCheckboxFieldMatch('website_track');
-            submenuInput.attr('checked', 'checked');
-        }
-        if (rpcData[0]['website_track_proposal']) {
-            submenuInput = this._getCheckboxFieldMatch('website_track_proposal');
-            submenuInput.attr('checked', 'checked');
-        }
-    },
-
-    _toggleTalkProposal: function (val) {
-        var self = this;
-        this._rpc({
-            model: this.modelName,
-            method: 'toggle_website_track_proposal',
-            args: [[this.eventId], val],
-        }).then(function () {
-            self._reloadEventPage();
-        });
-    },
-
-    _toggleDisplayTalks: function (val) {
-        var self = this;
-        this._rpc({
-            model: this.modelName,
-            method: 'toggle_website_track',
-            args: [[this.eventId], val],
-        }).then(function () {
-            self._reloadEventPage();
-        });
-    }
-
-});
-
-});
diff --git a/addons/website_event_track_online/static/src/scss/event_track_templates.scss b/addons/website_event_track/static/src/scss/event_track_templates.scss
similarity index 100%
rename from addons/website_event_track_online/static/src/scss/event_track_templates.scss
rename to addons/website_event_track/static/src/scss/event_track_templates.scss
diff --git a/addons/website_event_track_session/static/src/scss/event_track_templates.scss b/addons/website_event_track/static/src/scss/event_track_templates_online.scss
similarity index 100%
rename from addons/website_event_track_session/static/src/scss/event_track_templates.scss
rename to addons/website_event_track/static/src/scss/event_track_templates_online.scss
diff --git a/addons/website_event_track_online/static/src/scss/pwa_frontend.scss b/addons/website_event_track/static/src/scss/pwa_frontend.scss
similarity index 100%
rename from addons/website_event_track_online/static/src/scss/pwa_frontend.scss
rename to addons/website_event_track/static/src/scss/pwa_frontend.scss
diff --git a/addons/website_event_track/static/src/xml/customize_options.xml b/addons/website_event_track/static/src/xml/customize_options.xml
deleted file mode 100644
index b7d64bca0db..00000000000
--- a/addons/website_event_track/static/src/xml/customize_options.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<templates xml:space="preserve">
-
-    <t t-name="website_event.customize_options" t-extend="website_event.customize_options">
-        <t t-jquery="a[name='display-website-menu']" t-operation="after">
-            <a href="#" name="display-showcase-talks" class="dropdown-item" role="menuitem">
-                <label class="o_switch" for="display-showcase-talks">
-                    <input id="display-showcase-talks" type="checkbox"/>
-                    <span/>
-                    Showcase Talks
-                </label>
-            </a>
-            <a href="#" name="allow-talk-proposal" class="dropdown-item" role="menuitem">
-                <label class="o_switch" for="allow-talk-proposal">
-                    <input id="allow-talk-proposal" type="checkbox"/>
-                    <span/>
-                    Allow Talks Proposals
-                </label>
-            </a>
-        </t>
-    </t>
-
-</templates>
diff --git a/addons/website_event_track_online/static/src/xml/website_event_pwa.xml b/addons/website_event_track/static/src/xml/website_event_pwa.xml
similarity index 100%
rename from addons/website_event_track_online/static/src/xml/website_event_pwa.xml
rename to addons/website_event_track/static/src/xml/website_event_pwa.xml
diff --git a/addons/website_event_track/tests/__init__.py b/addons/website_event_track/tests/__init__.py
index 3773e715842..aac974d7656 100644
--- a/addons/website_event_track/tests/__init__.py
+++ b/addons/website_event_track/tests/__init__.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from . import common
+from . import test_track_internals
 from . import test_website_event
diff --git a/addons/website_event_track_online/tests/common.py b/addons/website_event_track/tests/common.py
similarity index 91%
rename from addons/website_event_track_online/tests/common.py
rename to addons/website_event_track/tests/common.py
index f3d5e52f53b..5215f620950 100644
--- a/addons/website_event_track_online/tests/common.py
+++ b/addons/website_event_track/tests/common.py
@@ -1,7 +1,7 @@
 # -*- 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
+from odoo.addons.website_event.tests.common import TestEventOnlineCommon
 
 
 class TestEventTrackOnlineCommon(TestEventOnlineCommon):
diff --git a/addons/website_event_track_session/tests/test_track_internals.py b/addons/website_event_track/tests/test_track_internals.py
similarity index 98%
rename from addons/website_event_track_session/tests/test_track_internals.py
rename to addons/website_event_track/tests/test_track_internals.py
index 5ebcc48ae8e..e2af8c0c6fe 100644
--- a/addons/website_event_track_session/tests/test_track_internals.py
+++ b/addons/website_event_track/tests/test_track_internals.py
@@ -6,7 +6,7 @@ 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
+from odoo.addons.website_event_track.tests.common import TestEventTrackOnlineCommon
 
 
 class TestTrackSuggestions(TestEventTrackOnlineCommon):
diff --git a/addons/website_event_track/tests/test_website_event.py b/addons/website_event_track/tests/test_website_event.py
index bf6a2bd6965..1fedaf2d428 100644
--- a/addons/website_event_track/tests/test_website_event.py
+++ b/addons/website_event_track/tests/test_website_event.py
@@ -11,7 +11,7 @@ from odoo.tests.common import users
 class TestEventWebsiteTrack(TestWebsiteEventCommon):
 
     def _get_menus(self):
-        return super(TestEventWebsiteTrack, self)._get_menus() | set(['Talks', 'Agenda', 'Talk Proposals'])
+        return super(TestEventWebsiteTrack, self)._get_menus() | set(['Community', 'Talks', 'Agenda', 'Talk Proposals'])
 
     @users('user_eventmanager')
     def test_create_menu(self):
@@ -24,6 +24,7 @@ class TestEventWebsiteTrack(TestWebsiteEventCommon):
                 'name': 'test_reg',
             })],
             'website_menu': True,
+            'community_menu': True,
             'website_track': True,
             'website_track_proposal': True,
         })
@@ -37,6 +38,7 @@ class TestEventWebsiteTrack(TestWebsiteEventCommon):
             'date_begin': fields.Datetime.to_string(datetime.today() + timedelta(days=1)),
             'date_end': fields.Datetime.to_string(datetime.today() + timedelta(days=15)),
             'website_menu': True,
+            'community_menu': True,
             'website_track': True,
             'website_track_proposal': True,
         })
@@ -46,7 +48,7 @@ class TestEventWebsiteTrack(TestWebsiteEventCommon):
 
         introduction_menu = event.menu_id.child_id.filtered(lambda menu: menu.name == 'Introduction')
         introduction_menu.unlink()
-        self._assert_website_menus(event, set(['Location', 'Register', 'Talks', 'Agenda', 'Talk Proposals']))
+        self._assert_website_menus(event, set(['Location', 'Register', 'Community', 'Talks', 'Agenda', 'Talk Proposals']))
 
         menus = event.menu_id.child_id.filtered(lambda menu: menu.name in ['Agenda', 'Talk Proposals'])
         menus.unlink()
@@ -58,12 +60,12 @@ class TestEventWebsiteTrack(TestWebsiteEventCommon):
         self.assertFalse(event.website_track)
         self.assertFalse(event.website_track_proposal)
 
-        self._assert_website_menus(event, set(['Location', 'Register']))
+        self._assert_website_menus(event, set(['Location', 'Register', 'Community']))
 
         event.write({'website_track_proposal': True})
         self.assertTrue(event.website_track)
         self.assertTrue(event.website_track_proposal)
-        self._assert_website_menus(event, set(['Location', 'Register', 'Talks', 'Agenda', 'Talk Proposals']))
+        self._assert_website_menus(event, set(['Location', 'Register', 'Community', 'Talks', 'Agenda', 'Talk Proposals']))
 
     @users('user_eventmanager')
     def test_write_menu(self):
@@ -71,6 +73,7 @@ class TestEventWebsiteTrack(TestWebsiteEventCommon):
         self.assertFalse(event.menu_id)
         event.write({
             'website_menu': True,
+            'community_menu': True,
             'website_track': True,
             'website_track_proposal': True,
         })
diff --git a/addons/website_event_track_online/views/assets.xml b/addons/website_event_track/views/assets.xml
similarity index 53%
rename from addons/website_event_track_online/views/assets.xml
rename to addons/website_event_track/views/assets.xml
index 3590b1c8b56..c94ee9ece00 100644
--- a/addons/website_event_track_online/views/assets.xml
+++ b/addons/website_event_track/views/assets.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Track Online Assets Frontend">
+<template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Event Track Assets">
     <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"/>
+        <link rel="stylesheet" href="/website_event_track/static/src/css/website_event_track.css"/>
+        <link rel="stylesheet" type="text/scss" href="/website_event_track/static/src/scss/event_track_templates.scss"/>
+        <link rel="stylesheet" type="text/scss" href="/website_event_track/static/src/scss/event_track_templates_online.scss"/>
+        <link rel="stylesheet" type="text/scss" href="/website_event_track/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"/>
+        <script type="text/javascript" src="/website_event_track/static/src/js/website_event_track.js"></script>
+        <script type="text/javascript" src="/website_event_track/static/src/js/event_track_reminder.js"></script>
+        <script type="text/javascript" src="/website_event_track/static/src/js/website_event_pwa_widget.js"/>
+        <script type="text/javascript" src="/website_event_track/static/lib/idb-keyval/idb-keyval.js"/>
     </xpath>
 </template>
 
diff --git a/addons/website_event_track/views/event_views.xml b/addons/website_event_track/views/event_event_views.xml
similarity index 59%
rename from addons/website_event_track/views/event_views.xml
rename to addons/website_event_track/views/event_event_views.xml
index 111cae04edc..a06ca4581ad 100644
--- a/addons/website_event_track/views/event_views.xml
+++ b/addons/website_event_track/views/event_event_views.xml
@@ -1,25 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="event_type_view_form_inherit_track" model="ir.ui.view">
-        <field name="name">event.type.view.form.inherit.track</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="website_track"/> <field name="website_track"/>
-                </div>
-                <div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
-                    <label class="col-lg-4" for="website_track_proposal"/> <field name="website_track_proposal"/>
-                </div>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="view_event_form" model="ir.ui.view">
-        <field name="name">Event Tracks</field>
-        <field name="inherit_id" ref="website_event.event_event_view_form_inherit_website"/>
+    <record id="event_event_view_form" model="ir.ui.view">
+        <field name="name">event.event.view.from.inherit.track</field>
+        <field name="inherit_id" ref="website_event.event_event_view_form"/>
         <field name="model">event.event</field>
         <field name="priority" eval="3"/>
         <field name="arch" type="xml">
@@ -38,10 +22,16 @@
                     <field name="sponsor_count" string="Sponsors" widget="statinfo"/>
                 </button>
             </xpath>
+            <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>
         </field>
     </record>
 
-    <record id="event_event_view_list_inherit_website_event_track" model="ir.ui.view">
+    <record id="event_event_view_list" model="ir.ui.view">
         <field name="name">event.event.view.list.inherit.website.event.track</field>
         <field name="model">event.event</field>
         <field name="inherit_id" ref="event.view_event_tree"/>
diff --git a/addons/website_event_track/views/event_menus.xml b/addons/website_event_track/views/event_menus.xml
index 9b5b597c5da..8ec7b7b2d95 100644
--- a/addons/website_event_track/views/event_menus.xml
+++ b/addons/website_event_track/views/event_menus.xml
@@ -24,6 +24,13 @@
         groups="base.group_no_one"
         sequence="32"/>
 
+    <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="menu_event_track_tag"
         name="Track Tags"
@@ -32,6 +39,13 @@
         groups="base.group_no_one"
         sequence="34"/>
 
+    <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"/>
+
     <menuitem id="menu_event_sponsor_type"
         name="Sponsor Types"
         action="event_sponsor_type_action"
@@ -39,11 +53,4 @@
         groups="base.group_no_one"
         sequence="40"/>
 
-    <menuitem id="menu_website_event_menu"
-        name="Website Menus"
-        action="website_event_menu_action"
-        parent="event.menu_event_configuration"
-        groups="base.group_no_one"
-        sequence="99"/>
-
 </data></odoo>
diff --git a/addons/website_event_track/views/event_sponsor_views.xml b/addons/website_event_track/views/event_sponsor_views.xml
index a7ee5442014..b38459122d5 100644
--- a/addons/website_event_track/views/event_sponsor_views.xml
+++ b/addons/website_event_track/views/event_sponsor_views.xml
@@ -10,6 +10,7 @@
                 <sheet>
                     <group>
                         <field name="name"/>
+                        <field name="display_ribbon_style"/>
                         <field name="sequence" groups="base.group_no_one"/>
                     </group>
                 </sheet>
@@ -24,6 +25,7 @@
             <tree editable="bottom" string="Event Sponsor Type">
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>
+                <field name="display_ribbon_style"/>
             </tree>
         </field>
     </record>
@@ -40,6 +42,9 @@
             <search string="Event Sponsors">
                 <field name="partner_id"/>
                 <field name="event_id"/>
+                <field name="name"/>
+                <field name="email"/>
+                <field name="phone"/>
                 <filter string="Archived" name="archived" domain="[('active', '=', False)]"/>
                 <group string="Group By" expand="0">
                     <filter string="Event" name="group_by_event_id" domain="[]" context="{'group_by': 'event_id'}"/>
@@ -57,18 +62,24 @@
                 <sheet>
                     <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="active" invisible="1"/>
-                    <field name="image_128" widget="image" class="oe_avatar"/>
-                    <h1><field name="partner_id"/></h1>
+                    <field name="image_512" widget="image" class="oe_avatar"/>
+                    <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>
                     <group>
                         <group>
                             <field name="event_id"/>
-                            <field name="partner_email" widget="email"/>
-                            <field name="url" widget="url" string="Website"/>
+                            <field name="partner_id" string="Partner"/>
+                            <field name="email" widget="email" string="Email"
+                                placeholder="e.g. : open.wood.decoration@example.com"/>
+                            <field name="url" widget="url" string="Website"
+                                placeholder=">e.g. : https://www.odoo.com"/>
                         </group>
                         <group>
                             <field name="sponsor_type_id"/>
-                            <field name="partner_phone" widget="phone" options="{'enable_sms': True}"/>
-                            <field name="partner_mobile" widget="phone" options="{'enable_sms': True}"/>
+                            <field name="phone" widget="phone" string="Phone" options="{'enable_sms': True}"/>
+                            <field name="mobile" widget="phone" string="Mobile" options="{'enable_sms': True}"/>
                         </group>
                     </group>
                 </sheet>
@@ -85,9 +96,13 @@
         <field name="name">event.sponsor.view.tree</field>
         <field name="model">event.sponsor</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree multi_edit="1">
                 <field name="sequence" widget="handle"/>
-                <field name="partner_id"/>
+                <field name="partner_id" readonly="1"/>
+                <field name="name"/>
+                <field name="email"/>
+                <field name="phone"/>
+                <field name="mobile"/>
                 <field name="url" string="Website"/>
                 <field name="sponsor_type_id"/>
             </tree>
@@ -133,5 +148,6 @@
 </p>
         </field>
     </record>
+
 </data>
 </odoo>
diff --git a/addons/website_event_track_online/views/event_templates_registration.xml b/addons/website_event_track/views/event_templates.xml
similarity index 91%
rename from addons/website_event_track_online/views/event_templates_registration.xml
rename to addons/website_event_track/views/event_templates.xml
index 67afcd812ba..891c374de1a 100644
--- a/addons/website_event_track_online/views/event_templates_registration.xml
+++ b/addons/website_event_track/views/event_templates.xml
@@ -20,7 +20,7 @@
         <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 t-call="website_event_track.pwa_manifest"/>
         </t>
     </xpath>
 </template>
@@ -30,7 +30,7 @@
         <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 t-call="website_event_track.pwa_manifest"/>
         </t>
     </xpath>
 </template>
diff --git a/addons/website_event_track/views/event_track_location_views.xml b/addons/website_event_track/views/event_track_location_views.xml
new file mode 100644
index 00000000000..a2499f02200
--- /dev/null
+++ b/addons/website_event_track/views/event_track_location_views.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <!-- EVENTS/CONFIGURATION/EVENT locations -->
+    <record model="ir.ui.view" id="view_event_location_form">
+        <field name="name">Event Locations</field>
+        <field name="model">event.track.location</field>
+        <field name="arch" type="xml">
+            <form string="Event Locations">
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_event_location_tree">
+        <field name="name">Event Location</field>
+        <field name="model">event.track.location</field>
+        <field name="arch" type="xml">
+            <tree string="Event Location" editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_event_track_location">
+        <field name="name">Event Locations</field>
+        <field name="res_model">event.track.location</field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track/views/event_track_stage_views.xml b/addons/website_event_track/views/event_track_stage_views.xml
new file mode 100644
index 00000000000..9ee7adf3c2b
--- /dev/null
+++ b/addons/website_event_track/views/event_track_stage_views.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <!-- EVENTS TRACK STAGES-->
+    <record id="event_track_stage_view_search" model="ir.ui.view">
+        <field name="name">event.track.stage.view.search</field>
+        <field name="model">event.track.stage</field>
+        <field name="arch" type="xml">
+            <search string="Track Stage">
+               <field name="name" string="Track Stages"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="event_track_stage_view_form" model="ir.ui.view">
+        <field name="name">event.track.stage.view.form</field>
+        <field name="model">event.track.stage</field>
+        <field name="arch" type="xml">
+            <form string="Track Stage">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="mail_template_id"/>
+                            <field name="sequence" groups="base.group_no_one"/>
+                        </group>
+                        <group>
+                            <field name="fold"/>
+                            <field name="is_accepted"/>
+                            <field name="is_done"/>
+                            <field name="is_cancel"/>
+                            <field name="color" widget="color_picker"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="event_track_stage_view_tree" model="ir.ui.view">
+        <field name="name">event.track.stage.view.tree</field>
+        <field name="model">event.track.stage</field>
+        <field name="arch" type="xml">
+            <tree string="Track Stage">
+                <field name="sequence" widget="handle" groups="event.group_event_manager"/>
+                <field name="name"/>
+                <field name="is_accepted"/>
+                <field name="is_done"/>
+                <field name="is_cancel"/>
+                <field name="fold"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_event_track_stage_kanban" model="ir.ui.view">
+        <field name="name">event.track.stage.kanban</field>
+        <field name="model">event.track.stage</field>
+        <field name="arch" type="xml">
+            <kanban>
+                <field name="name"/>
+                <field name="fold"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_global_click">
+                            <div>
+                                <strong class="o_kanban_record_title"><field name="name"/></strong>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="event_track_stage_action" model="ir.actions.act_window">
+        <field name="name">Track Stages</field>
+        <field name="res_model">event.track.stage</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="view_id" ref="event_track_stage_view_tree"/>
+        <field name="help" type="html">
+          <p class="o_view_nocontent_smiling_face">
+            Add a new stage in the task pipeline
+          </p><p>
+            Define the steps that will be used in the event from the
+            creation of the track, up to the closing of the track.
+            You will use these stages in order to track the progress in
+            solving an event track.
+          </p>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/event_track_tag_views.xml b/addons/website_event_track/views/event_track_tag_views.xml
similarity index 71%
rename from addons/website_event_track_online/views/event_track_tag_views.xml
rename to addons/website_event_track/views/event_track_tag_views.xml
index a4dd0cbedba..780b9814b8b 100644
--- a/addons/website_event_track_online/views/event_track_tag_views.xml
+++ b/addons/website_event_track/views/event_track_tag_views.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<odoo><data>
+<odoo>
     <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>
@@ -39,31 +39,38 @@
         <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>
+    <record model="ir.ui.view" id="view_event_track_tag_form">
+        <field name="name">Track Tags</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>
+            <form string="Event Track Tag">
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                        <field name="color" widget="color_picker"/>
+                    <field name="category_id"/>
+                    </group>
+                </sheet>
+            </form>
         </field>
     </record>
 
-    <record id="event_track_tag_view_list" model="ir.ui.view">
-        <field name="name">event.track.tag.view.list.inherit.online</field>
+    <record model="ir.ui.view" id="view_event_track_tag_tree">
+        <field name="name">Tracks Tag</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">
+            <tree string="Event Track Tag" editable="bottom">
                 <field name="sequence" widget="handle"/>
-            </xpath>
-            <xpath expr="//field[@name='name']" position="after">
+                <field name="name"/>
                 <field name="color" widget="color_picker"/>
                 <field name="category_id"/>
-            </xpath>
+            </tree>
         </field>
     </record>
 
-</data></odoo>
+    <record model="ir.actions.act_window" id="action_event_track_tag">
+        <field name="name">Track Tags</field>
+        <field name="res_model">event.track.tag</field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track/views/event_track_templates.xml b/addons/website_event_track/views/event_track_templates.xml
deleted file mode 100644
index 17ed8bbb0bc..00000000000
--- a/addons/website_event_track/views/event_track_templates.xml
+++ /dev/null
@@ -1,449 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Event Track Assets">
-    <xpath expr="." position="inside">
-        <link rel="stylesheet" href="/website_event_track/static/src/css/website_event_track.css"/>
-        <script type="text/javascript" src="/website_event_track/static/src/js/website_event_track.js"></script>
-        <script type="text/javascript" src="/website_event_track/static/src/js/website_event_track_set_customize_options.js"></script>
-    </xpath>
-</template>
-
-<template name="Sponsors" id="event_sponsor" customize_show="True" inherit_id="website_event.layout">
-    <xpath expr="//div[@id='wrap']" position="inside">
-        <div class="container mt32 mb16 d-print-none" t-if="event.sponsor_ids">
-            <section>
-                <h2 class="text-center mb32">Our Sponsors</h2>
-            </section>
-            <div class="row">
-                <div t-attf-class="col-sm-6 col-lg-#{(len(event.sponsor_ids) > 6) and 2 or (12 // len(event.sponsor_ids))} text-center mb16 oe_sponsor" t-foreach="event.sponsor_ids" t-as="sponsor">
-                    <t t-if="sponsor.url">
-                        <a t-att-href="sponsor.url" class="bg-white o_wevent_sponsor">
-                            <span t-field="sponsor.image_128"
-                                t-options='{"widget": "image", "class": "shadow"}'/>
-                            <span t-field="sponsor.sponsor_type_id" t-attf-class="o_ribbon o_ribbon_right ribbon_#{sponsor.sponsor_type_id.name}"/>
-                        </a>
-                    </t>
-                    <t t-if="not sponsor.url">
-                        <span class="bg-white o_wevent_sponsor">
-                            <span t-field="sponsor.image_128"
-                                t-options='{"widget": "image", "class": "shadow"}'/>
-                            <span t-field="sponsor.sponsor_type_id" t-attf-class="o_ribbon o_ribbon_right ribbon_#{sponsor.sponsor_type_id.name}"/>
-                        </span>
-                    </t>
-                </div>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-<template id="agenda">
-    <t t-call="website_event.layout">
-        <div class="oe_structure" id="oe_structure_website_event_track_agenda_1"/>
-        <section class="container pt48">
-            <h1 t-field="event.name"/>
-            <div class="form-inline float-right">
-                <label class="invisible text-muted" id="search_summary"><span id="search_number">0</span> Found </label>
-                <input type="text" class="form-control" placeholder="Filter Tracks..." id="event_track_search"/>
-            </div>
-        </section>
-        <t t-set="dayslist" t-value="list(days.keys())"/>
-        <t t-set="dayslist2" t-value="dayslist.sort()"/> <!-- display days in the right order -->
-        <section class="container" t-foreach="dayslist" t-as="day">
-            <t t-set="locations" t-value="days[day]['locations']"/>
-            <t t-set="dates" t-value="days[day]['dates']"/>
-            <h3 class="o_page_header mt0">
-                <span t-field="tracks_by_days[day][0].date" t-options="{'widget': 'date'}"/>
-                <small><t t-esc="len(tracks_by_days[day])"/> talks</small>
-            </h3>
-            <table id="table_search" class="table table-bordered table-sm">
-            <tr>
-                <th/>
-                <t t-foreach="locations.keys()" t-as="location">
-                    <th t-if="location" class="active">
-                        <span t-esc="location and location.name or 'Unknown'"/>
-                    </th>
-                </t>
-            </tr>
-            <tr t-foreach="dates" t-as="dt">
-                <td class="active">
-                    <b t-esc="dt[-1]"/>
-                </td>
-                <t t-if="dt[2]"> <!-- Not a multi location -->
-                    <t t-foreach="locations" t-as="location">
-                        <t t-if="location and dt[1].get(location, False)">
-                            <t t-set="track" t-value="dt[1][location][0]"/>
-                            <t t-if="track">
-                                <td t-att-rowspan="dt[1][location][3]" t-attf-class="event_color_#{track.color} #{track and 'event_track' or ''}">
-                                    <t t-if="track" name="track_agenda_track_cell">
-                                        <a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }">
-                                            <span t-esc="track and track.name"/>
-                                            <span t-if="not track.website_published" class="badge badge-warning">unpublished</span>
-                                        </a>
-                                        <div class="text-muted">
-                                            <small t-if="track.partner_id" t-esc="track.partner_id.sudo().name"/>
-                                            <small t-if="not track.partner_id" t-esc="track.partner_name"/>
-                                        </div>
-                                    </t>
-                                </td>
-                            </t>
-                            <td t-if="not track" t-att-rowspan="dt[1][location][3]" class="event_track"/>
-                        </t>
-                    </t>
-                </t><t t-if="not dt[2]">
-                    <t t-set="track" t-value="dt[1][False][0]"/>
-                    <td t-att-colspan="len(locations)-1" t-attf-class="text-center event_color_#{track.color} #{track and 'event_track' or ''}">
-                        <a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }">
-                            <span t-esc="track.name"/>
-                        </a>
-                        <div class="text-muted">
-                            <small t-if="track.partner_id" t-esc="track.partner_id.sudo().name"/>
-                            <small t-if="not track.partner_id" t-esc="track.partner_name"/>
-                        </div>
-                    </td>
-                </t>
-            </tr>
-            </table>
-        </section>
-        <div class="oe_structure" id="oe_structure_website_event_track_agenda_2"/>
-    </t>
-</template>
-
-<template id="tracks">
-    <t t-call="website_event.layout">
-    <div class="oe_structure" id="oe_structure_website_event_track_tracks_1"/>
-        <section class="pt48 pb48">
-            <div class="container">
-                <div class="row">
-                    <div id="left_column">
-                    </div>
-                    <div class="col-lg-9">
-                        <div class="alert alert-warning" t-if="not len(tracks)" role="alert">
-                            No tracks found!
-                        </div>
-                        <div class="row mb-2" t-foreach="tracks" t-as="track">
-                            <div class="col-md-2">
-                                <t t-if="track.image">
-                                    <span t-field="track.image"
-                                        t-options='{"widget": "image", "class": "rounded-circle"}'/>
-                                </t>
-                            </div>
-                            <div class="col-md-10">
-                                <h3 class="mt0 mb0">
-                                    <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>
-                                </h3>
-                                <ul class="list-inline mb0">
-                                    <li t-if="track.partner_id" class="list-inline-item">
-                                        <i class="fa fa-user text-primary"/>
-                                        <t t-esc="track.partner_id.sudo().name"/>
-                                    </li>
-                                    <li t-if="track.date" class="list-inline-item">
-                                        <i class="fa fa-calendar text-primary"/>
-                                        <span t-field="track.date" t-options='{"hide_seconds":"True"}'/>
-                                    </li>
-                                    <li class="list-inline-item" t-if="track.location_id">
-                                        <i class="fa fa-map-marker"/>
-                                        <span t-field="track.location_id"/>
-                                    </li>
-                                </ul>
-                                <ul class="list-inline">
-                                    <li t-foreach="track.tag_ids" t-as="tag_id" class="list-inline-item fa fa-tags" t-if="tag_id.color != 0">
-                                        <a t-attf-href="/event/#{ slug(event) }/track/tag/#{ slug(tag_id) }">
-                                            <i class="fa fa-tags"/>
-                                            <span t-field="tag_id.name"/>
-                                        </a>
-                                    </li>
-                                </ul>
-                                <p class="mt8"><t t-esc="html2plaintext(track.description or '')[0:500]"/><t t-if="track.description">...</t></p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-        <div class="oe_structure" id="oe_structure_website_event_track_tracks_2"/>
-    </t>
-</template>
-
-<template id="tracks_filter" inherit_id="website_event_track.tracks" customize_show="True" name="Filter on Tags">
-    <xpath expr="//div[@id='left_column']" position="inside">
-        <ul class="nav nav-pills flex-column">
-            <li class="nav-item"><a t-attf-href="/event/#{ slug(event) }/track" t-attf-class="nav-link #{'' if searches.get('tag') else ' active'}">All Tags</a></li>
-            <t t-foreach="tags" t-as="tag">
-                <li class="nav-item">
-                    <a t-attf-href="/event/#{ slug(event) }/track/tag/#{ slug(tag) }" t-attf-class="nav-link#{searches.get('tag') == tag.id and ' active' or ''}">
-                        <t t-esc="tag.name"/>
-                    </a>
-                </li>
-            </t>
-        </ul>
-    </xpath>
-    <xpath expr="//div[@id='left_column']" position="attributes">
-        <attribute name="class">col-lg-3 css_no_print</attribute>
-    </xpath>
-</template>
-
-
-<template id="track_edit_options" inherit_id="website.user_navbar" name="Edit Track Options">
-    <xpath expr="//li[@id='edit-page-menu']" position="after">
-        <t t-if="main_object._name == 'event.track'" t-set="action" t-value="'website_event_track.action_event_track'" />
-    </xpath>
-</template>
-<template id="track_view">
-    <t t-call="website_event.layout">
-        <section class="pt48">
-            <div class="container">
-                <div class="row">
-                    <div class="col-12">
-                        <h1 t-field="track.name"/>
-                        <small>Proposed by
-                            <span t-if="track.partner_id" t-field="track.partner_id.sudo().name"/>
-                            <span t-if="not track.partner_id" t-field="track.partner_name"/>
-                        </small>
-                        <ul t-if="track.tag_ids" class="text-center text-muted list-inline">
-                            <li t-foreach="track.tag_ids" t-as="tag_id" class="list-inline-item" t-if="tag_id.color != 0">
-                                <span class="fa fa-tags"></span>
-                                <a t-attf-href="/event/#{ slug(event) }/track/tag/#{ slug(tag_id) }">
-                                    <span t-field="tag_id.name"/>
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </section>
-        <section class="pt32">
-            <div class="container">
-                <div class="row">
-                    <div class="col-lg-8">
-                        <div t-field="track.description"/>
-                        <h3>About The Speaker</h3>
-                        <div t-field="track.partner_biography"/>
-                        <div t-if="track.partner_id" class="row mt32">
-                            <div class="col-md-2">
-                                <span t-if="track.image" t-field="track.image" t-options="{'widget': 'image', 'class': 'rounded-circle'}"/>
-                                <span t-else="" t-field="track.partner_id.sudo().image_128" t-options='{"widget": "image", "class": "rounded-circle"}'/>
-                            </div>
-                            <div class="col-md-10">
-                                <h4 t-field="track.partner_id.name" class="mb4"/>
-                                <div class="mb16" 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>
-                                </div>
-                                <div t-field="track.partner_id.website_description"/>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-lg-4" id="right_column">
-                        <div class="card">
-                            <h4 class="card-header">Practical Info</h4>
-                            <div class="card-body">
-                                <b>Date</b><br/>
-                                <t t-if="track.date">
-                                    <span t-field="track.date" t-options='{"hide_seconds":"True", "format": "short"}'/>
-                                    <t t-if="event.date_tz">
-                                        (<span t-field="track.date" t-options='{"format": "zzz"}'/>)
-                                    </t>
-                                </t>
-                                <t t-else="">
-                                    <span>To be scheduled</span>
-                                </t>
-                                <br/>
-                                <b>Duration</b><br/>
-                                <span t-field="track.duration" t-options='{"widget": "duration", "unit": "hour", "round": "minute"}'/><br/>
-                                <b>Location</b><br/>
-                                <span t-field="track.location_id"/><br/>
-                            </div>
-                        </div>
-
-                        <div class="card" t-if="False">
-                            <h4 class="card-header">Documents</h4>
-                            <div class="card-body">
-                                Put here the list of documents, like slides of
-                                the presentations. Remove the above t-if when
-                                it's implemented.
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </t>
-</template>
-
-<template id="event_track_proposal">
-    <t t-call="website_event.layout">
-        <div class="oe_structure" id="oe_structure_website_event_track_proposal_1"/>
-        <div class="container">
-            <section class="pt48">
-                <h1 class="o_page_header">Call for Proposals</h1>
-                <h2 class="text-center text-secondary font-weight-bold my-4" t-esc="event.name"/>
-            </section>
-            <section id="forms" t-if="not event.website_track_proposal">
-                <h1>Proposals are closed!</h1>
-                <p>
-                    This event does not accept proposals.
-                </p>
-            </section>
-            <section class="row">
-                <div class="col-lg-9">
-                    <div class="oe_structure">
-                        <section>
-                            <h3 class="o_page_header mt16">
-                                Introduction
-                            </h3>
-                            <p>
-                                We will accept a broad range of
-                                presentations, from reports on academic and
-                                commercial projects to tutorials and case
-                                studies. As long as the presentation is
-                                interesting and potentially useful to the
-                                audience, it will be considered for
-                                inclusion in the programme.
-                            </p>
-                        </section>
-                    </div>
-                    <div t-if="not track">
-                        <section class="mt-5">
-                            <h3 class="o_page_header">Application</h3>
-                            <p>
-                                Fill this form to propose your talk.
-                            </p>
-                            <div class="alert alert-info" role="alert">
-                                <i class="fa fa-info-circle"/>
-                                You can add multiple speakers by separating names, emails and phones with commas.
-                            </div>
-                        </section>
-                        <section id="forms" class="mb-5"
-                            t-if="event.website_track_proposal">
-                            <form class="mt32 js_website_submit_form" t-attf-action="/event/#{event.id}/track_proposal/post" method="post" enctype="multipart/form-data">
-                                <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-                                <div class="form-group row">
-                                    <label class="col-lg-3 col-md-4 col-form-label" for="track_name">Talk Title</label>
-                                    <div class="col-lg-7 col-md-8">
-                                        <input type="text" class="form-control" name="track_name" required="True"/>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-lg-3 col-md-4 col-form-label" for="description">Talk Introduction</label>
-                                    <div class="col-lg-7 col-md-8">
-                                        <textarea  class="form-control" name="description"/>
-                                    </div>
-                                </div>
-                                <div class="form-group row" t-if="len(event.allowed_track_tag_ids)">
-                                    <label class="col-lg-3 col-md-4 col-form-label" for="phone">Tags</label>
-                                    <div class="col-lg-9 col-md-8">
-                                        <div class="row">
-                                            <label class="col-md-4" t-foreach="event.allowed_track_tag_ids" t-as="tag">
-                                                <input type="checkbox" value="1" t-attf-name="tag_#{str(tag.id)}"/>
-                                                <t t-esc="tag.name"/>
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-lg-3 col-md-4 col-form-label" for="partner_name">Speaker(s) Name</label>
-                                    <div class="col-lg-7 col-md-8">
-                                        <input type="text" class="form-control" name="partner_name" required="True"/>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-lg-3 col-md-4 col-form-label" for="email_from">Speaker(s) Email</label>
-                                    <div class="col-lg-7 col-md-8">
-                                        <input type="email" class="form-control" name="email_from" required="True" multiple="multiple"/>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-lg-3 col-md-4 col-form-label" for="phone">Speaker(s) Phone</label>
-                                    <div class="col-lg-7 col-md-8">
-                                        <input type="text" class="form-control" name="phone" required="True"/>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-lg-3 col-md-4 col-form-label" for="biography">Speaker(s) Biography</label>
-                                    <div class="col-lg-7 col-md-8">
-                                        <textarea  class="form-control" name="biography" rows="5"/>
-                                    </div>
-                                </div>
-                                <div class="form-group row">
-                                    <label class="col-lg-3 col-md-4 col-form-label" for="image">Speaker(s) Picture</label>
-                                    <div class="col-lg-7 col-md-8">
-                                        <input name="image" type="file" accept="image/*"/>
-                                    </div>
-                                </div>
-                                <div class="form-group row o_form_buttons">
-                                    <div class="offset-lg-3 offset-md-4 col-md-8 col-lg-7">
-                                        <button type="submit" class="btn btn-primary">Submit Proposal</button>
-                                    </div>
-                                </div>
-                            </form>
-                        </section>
-                    </div>
-                    <div t-else="">
-                        <t t-call="website_event_track.event_track_proposal_success"/>
-                    </div>
-                    <div class="oe_structure" id="oe_structure_website_event_track_proposal_2"/>
-                </div>
-                <div class="col-lg-3">
-                    <div class="card mb-3 bg-secondary">
-                        <h4 class="card-header">Talks Types</h4>
-                        <div class="card-body">
-                            <ul class="list-unstyled">
-                                <li>
-                                    <strong>Regular Talks</strong>. These are standard talks with slides,
-                                    alocated in slots of 60 minutes.
-                                </li><li>
-                                    <strong>Lightning Talks</strong>. These are 30 minutes talks on many
-                                    different topics. Most topics are accepted in lightning talks.
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-                    <div class="card bg-secondary">
-                        <h4 class="card-header">Submission Agreement</h4>
-                        <div class="card-body">
-                            <p>
-                            We require speakers to accept an agreement in which they commit to:
-                            </p>
-                            <ul class="list-unstyled">
-                                <li>
-                                    Timely release of presentation material (slides),
-                                    for publishing on our website.
-                                </li><li>
-                                    Allow video and audio recording of their
-                                    presentation, for publishing on our website.
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </section>
-        </div>
-        <div class="oe_structure" id="oe_structure_website_event_track_proposal_3"/>
-    </t>
-</template>
-
-<template id="event_track_proposal_success">
-    <section class="mt-5">
-        <h3 class="o_page_header">Application</h3>
-        <p>
-            Thank you for your proposal.
-        </p><p>
-            We will evaluate your proposition and get back to you shortly.
-        </p>
-    </section>
-</template>
-
-<!-- Chatter templates -->
-<template id="event_track_template_new">
-    <p>New track proposal <a href="#" t-att-data-oe-model="track._name" t-att-data-oe-id="track.id"> <t t-esc="track.name"/></a></p>
-    <ul>
-        <li><b>Proposed By</b>: <t t-esc="track.partner_name or track.partner_email"/></li>
-        <li><b>Mail</b>: <a t-attf-href="mailto:#{track.partner_email}"><t t-esc="track.partner_email"/></a></li>
-        <li><b>Phone</b>: <t t-esc="track.partner_phone"/></li>
-        <li><b>Speakers Biography</b>: <div t-field="track.partner_biography"/></li>
-        <li><b>Talk Introduction</b>: <div t-field="track.description"/></li>
-    </ul>
-</template>
-
-</odoo>
diff --git a/addons/website_event_track_online/views/event_track_templates_agenda.xml b/addons/website_event_track/views/event_track_templates_agenda.xml
similarity index 94%
rename from addons/website_event_track_online/views/event_track_templates_agenda.xml
rename to addons/website_event_track/views/event_track_templates_agenda.xml
index ee8fca52f3e..1608924587c 100644
--- a/addons/website_event_track_online/views/event_track_templates_agenda.xml
+++ b/addons/website_event_track/views/event_track_templates_agenda.xml
@@ -6,15 +6,15 @@
     <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"/>
+            <t t-set="option_track_wishlist" t-value="not event.is_done and request.website.viewref('website_event_track.agenda_topbar_wishlist').active"/>
             <!-- Topbar -->
-            <t t-call="website_event_track_online.agenda_topbar"/>
+            <t t-call="website_event_track.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"/>
+                    <t t-call="website_event_track.agenda_main"/>
                 </div>
             </div>
             <!-- Drag/Drop Area -->
@@ -23,7 +23,6 @@
     </t>
 </template>
 
-
 <!-- ============================================================ -->
 <!-- TOPBAR: BASE NAVIGATION -->
 <!-- ============================================================ -->
@@ -46,7 +45,7 @@
 
 <!-- Option: Tracks display: optional wishlist -->
 <template id="agenda_topbar_wishlist"
-    inherit_id="website_event_track_online.agenda_topbar"
+    inherit_id="website_event_track.agenda_topbar"
     name="Allow Wishlists"
     active="True"
     customize_show="True">
@@ -119,14 +118,14 @@
                                 <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 ''} o_location_size_#{len(locations)}">
-                                        <t t-call="website_event_track_online.agenda_main_track"/>
+                                        <t t-call="website_event_track.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 ''} o_location_size_#{len(locations)}">
-                                        <t t-call="website_event_track_online.agenda_main_track"/>
+                                        <t t-call="website_event_track.agenda_main_track"/>
                                     </td>
                                 </t>
                                 <t t-set="used_cells" t-value="used_cells + tracks[track]['occupied_cells']"/>
@@ -151,13 +150,16 @@
 <template id="agenda_main_track" name="Track Agenda: Track">
     <div class="d-flex flex-column h-100">
         <div class="d-flex justify-content-end flex-wrap-reverse o_weagenda_track_badges">
+            <small t-if="track.is_track_live and not track.is_track_done and track.website_published"
+                class="mx-1 badge badge-danger">Live
+            </small>
             <small t-if="not track.website_published and user_event_manager and track.stage_id.is_accepted"
                    title="Unpublished"
                    class="ml-1 badge badge-danger o_wevent_online_badge_unpublished">Unpublished</small>
             <small t-if="not track.stage_id.is_accepted" title="Not 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-call="website_event_track.track_widget_reminder">
                     <t t-set="reminder_light" t-value="True"/>
                     <t t-set="reminder_small" t-value="True"/>
                     <t t-set="light_theme" t-value="False"/>
diff --git a/addons/website_event_track_session/views/event_track_templates_list.xml b/addons/website_event_track/views/event_track_templates_list.xml
similarity index 91%
rename from addons/website_event_track_session/views/event_track_templates_list.xml
rename to addons/website_event_track/views/event_track_templates_list.xml
index 7321fe5b970..85059f44c71 100644
--- a/addons/website_event_track_session/views/event_track_templates_list.xml
+++ b/addons/website_event_track/views/event_track_templates_list.xml
@@ -1,34 +1,28 @@
 <?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">
+<template id="tracks_session" name="Event Tracks">
+    <t t-call="website_event.layout">
         <div class="o_wevent_online 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"/>
+            <t t-set="option_track_wishlist" t-value="not event.is_done and request.website.viewref('website_event_track.session_topbar_wishlist').active"/>
             <!-- Topbar -->
-            <t t-call="website_event_track_session.session_topbar"/>
+            <t t-call="website_event_track.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"/>
+                    <t t-call="website_event_track.tracks_search"/>
                 </div>
                 <div class="row">
-                    <t t-call="website_event_track_session.tracks_main"/>
+                    <t t-call="website_event_track.tracks_main"/>
                 </div>
             </div>
             <!-- Drag/Drop Area -->
             <div id="oe_structure_wesession_index_2" class="oe_structure mb-5"/>
         </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"/>
+    </t>
 </template>
 
 <!-- ============================================================ -->
@@ -78,7 +72,7 @@
 
 <!-- Option: Topbar: optional tags filters -->
 <template id="session_topbar_tag"
-    inherit_id="website_event_track_session.session_topbar"
+    inherit_id="website_event_track.session_topbar"
     name="Filter by Tags"
     active="True"
     customize_show="True">
@@ -108,7 +102,7 @@
 
 <!-- Option: Tracks display: optional wishlist -->
 <template id="session_topbar_wishlist"
-    inherit_id="website_event_track_session.session_topbar"
+    inherit_id="website_event_track.session_topbar"
     name="Allow Wishlists"
     active="True"
     customize_show="True">
@@ -135,9 +129,9 @@
         </div>
     </t>
     <!-- Cards -->
-    <div class="col-12" t-call="website_event_track_session.tracks_display_cards"/>
+    <div class="col-12" t-call="website_event_track.tracks_display_cards"/>
     <!-- List -->
-    <div class="col-12" t-call="website_event_track_session.tracks_display_list"/>
+    <div class="col-12" t-call="website_event_track.tracks_display_list"/>
 </template>
 
 <!-- Tracks: Cards-based display -->
@@ -148,7 +142,7 @@
             <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"/>
+            <t t-call="website_event_track.tracks_cards_track"/>
         </div>
     </div>
     <div class="row mb-3" t-if="tracks_soon">
@@ -157,7 +151,7 @@
             <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"/>
+            <t t-call="website_event_track.tracks_cards_track"/>
         </div>
     </div>
 </template>
@@ -228,7 +222,7 @@
                                         t-esc="track.date"
                                         t-options="{'widget': 'datetime', 'time_only': True, 'format': 'short'}"/>
                                     <t t-if="option_track_wishlist"
-                                        t-call="website_event_track_online.track_widget_reminder">
+                                        t-call="website_event_track.track_widget_reminder">
                                         <t t-set="reminder_small" t-value="True"/>
                                     </t>
                                 </t>
@@ -242,7 +236,7 @@
                             </t>
                         </div>
                         <t t-foreach="track.tag_ids" t-as="tag">
-                            <t t-if="tag.color" t-call="website_event_track_session.track_tag_badge_link"/>
+                            <t t-if="tag.color" t-call="website_event_track.track_tag_badge_link"/>
                         </t>
                     </div>
                 </div>
@@ -268,7 +262,7 @@
                     <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-call="website_event_track.track_widget_reminder">
                                 <t t-set="reminder_light" t-value="True"/>
                                 <t t-set="light_theme" t-value="True"/>
                             </t>
@@ -277,7 +271,7 @@
                     <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-call="website_event_track.track_widget_reminder">
                                 <t t-set="reminder_light" t-value="True"/>
                             </t>
                         </span>
@@ -293,7 +287,7 @@
                         <!-- Tags> -->
                         <div>
                             <t t-foreach="track.tag_ids" t-as="tag">
-                                <t t-if="tag.color" t-call="website_event_track_session.track_tag_badge_info"/>
+                                <t t-if="tag.color" t-call="website_event_track.track_tag_badge_info"/>
                             </t>
                         </div>
                     </main>
diff --git a/addons/website_event_track/views/event_track_templates_misc.xml b/addons/website_event_track/views/event_track_templates_misc.xml
new file mode 100644
index 00000000000..398390513fd
--- /dev/null
+++ b/addons/website_event_track/views/event_track_templates_misc.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template name="Sponsors" id="event_sponsor" customize_show="True" inherit_id="website_event.layout">
+    <xpath expr="//div[@id='wrap']" position="inside">
+        <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>
+
+<!-- Chatter templates -->
+<template id="event_track_template_new">
+    <p>New track proposal <a href="#" t-att-data-oe-model="track._name" t-att-data-oe-id="track.id"> <t t-esc="track.name"/></a></p>
+    <ul>
+        <li><b>Proposed By</b>: <t t-esc="track.partner_name or track.partner_email"/></li>
+        <li><b>Mail</b>: <a t-attf-href="mailto:#{track.partner_email}"><t t-esc="track.partner_email"/></a></li>
+        <li><b>Phone</b>: <t t-esc="track.partner_phone"/></li>
+        <li><b>Speakers Biography</b>: <div t-field="track.partner_biography"/></li>
+        <li><b>Talk Introduction</b>: <div t-field="track.description"/></li>
+    </ul>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_session/views/event_track_templates_page.xml b/addons/website_event_track/views/event_track_templates_page.xml
similarity index 94%
rename from addons/website_event_track_session/views/event_track_templates_page.xml
rename to addons/website_event_track/views/event_track_templates_page.xml
index 766631a98bd..c8cbed11e45 100644
--- a/addons/website_event_track_session/views/event_track_templates_page.xml
+++ b/addons/website_event_track/views/event_track_templates_page.xml
@@ -6,14 +6,14 @@
         <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"/>
+            <t t-set="option_track_wishlist" t-value="not event.is_done and request.website.viewref('website_event_track.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"/>
+                    <t t-call="website_event_track.event_track_aside"/>
+                    <t t-call="website_event_track.event_track_content"/>
                 </div>
             </div>
             <!-- Drag/Drop Area -->
@@ -68,7 +68,7 @@
                 <div class="o_we_track_action_buttons d-flex justify-content-md-end align-items-center flex-wrap">
                     <div class="o_we_track_reminder_button my-1">
                         <div t-if="option_track_wishlist and not track.is_track_done"
-                            t-call="website_event_track_online.track_widget_reminder">
+                            t-call="website_event_track.track_widget_reminder">
                             <t t-set="reminder_small" t-value="False"/>
                             <t t-set="reminder_light" t-value="False"/>
                         </div>
@@ -140,7 +140,7 @@
             <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-call="website_event.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)"/>
@@ -178,10 +178,10 @@
                             <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"/>
+                                <t t-call="website_event_track.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"/>
+                                <t t-call="website_event_track.event_track_aside_other_track"/>
                             </div>
                         </li>
                     </ul>
diff --git a/addons/website_event_track/views/event_track_templates_proposal.xml b/addons/website_event_track/views/event_track_templates_proposal.xml
new file mode 100644
index 00000000000..794c5e54fe4
--- /dev/null
+++ b/addons/website_event_track/views/event_track_templates_proposal.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="event_track_proposal">
+    <t t-call="website_event.layout">
+        <div class="oe_structure" id="oe_structure_website_event_track_proposal_1"/>
+        <div class="container">
+            <section class="pt48">
+                <h1 class="o_page_header">Call for Proposals</h1>
+                <h2 class="text-center text-secondary font-weight-bold my-4" t-esc="event.name"/>
+            </section>
+            <section id="forms" t-if="not event.website_track_proposal">
+                <h1>Proposals are closed!</h1>
+                <p>
+                    This event does not accept proposals.
+                </p>
+            </section>
+            <section class="row">
+                <div class="col-lg-9">
+                    <div class="oe_structure">
+                        <section>
+                            <h3 class="o_page_header mt16">
+                                Introduction
+                            </h3>
+                            <p>
+                                We will accept a broad range of
+                                presentations, from reports on academic and
+                                commercial projects to tutorials and case
+                                studies. As long as the presentation is
+                                interesting and potentially useful to the
+                                audience, it will be considered for
+                                inclusion in the programme.
+                            </p>
+                        </section>
+                    </div>
+                    <div t-if="not track">
+                        <section class="mt-5">
+                            <h3 class="o_page_header">Application</h3>
+                            <p>
+                                Fill this form to propose your talk.
+                            </p>
+                            <div class="alert alert-info" role="alert">
+                                <i class="fa fa-info-circle"/>
+                                You can add multiple speakers by separating names, emails and phones with commas.
+                            </div>
+                        </section>
+                        <section id="forms" class="mb-5"
+                            t-if="event.website_track_proposal">
+                            <form class="mt32 js_website_submit_form" t-attf-action="/event/#{event.id}/track_proposal/post" method="post" enctype="multipart/form-data">
+                                <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                                <div class="form-group row">
+                                    <label class="col-lg-3 col-md-4 col-form-label" for="track_name">Talk Title</label>
+                                    <div class="col-lg-7 col-md-8">
+                                        <input type="text" class="form-control" name="track_name" required="True"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-3 col-md-4 col-form-label" for="description">Talk Introduction</label>
+                                    <div class="col-lg-7 col-md-8">
+                                        <textarea  class="form-control" name="description"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row" t-if="len(event.allowed_track_tag_ids)">
+                                    <label class="col-lg-3 col-md-4 col-form-label" for="phone">Tags</label>
+                                    <div class="col-lg-9 col-md-8">
+                                        <div class="row">
+                                            <label class="col-md-4" t-foreach="event.allowed_track_tag_ids" t-as="tag">
+                                                <input type="checkbox" value="1" t-attf-name="tag_#{str(tag.id)}"/>
+                                                <t t-esc="tag.name"/>
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-3 col-md-4 col-form-label" for="partner_name">Speaker(s) Name</label>
+                                    <div class="col-lg-7 col-md-8">
+                                        <input type="text" class="form-control" name="partner_name" required="True"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-3 col-md-4 col-form-label" for="email_from">Speaker(s) Email</label>
+                                    <div class="col-lg-7 col-md-8">
+                                        <input type="email" class="form-control" name="email_from" required="True" multiple="multiple"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-3 col-md-4 col-form-label" for="phone">Speaker(s) Phone</label>
+                                    <div class="col-lg-7 col-md-8">
+                                        <input type="text" class="form-control" name="phone" required="True"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-3 col-md-4 col-form-label" for="biography">Speaker(s) Biography</label>
+                                    <div class="col-lg-7 col-md-8">
+                                        <textarea  class="form-control" name="biography" rows="5"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-3 col-md-4 col-form-label" for="image">Speaker(s) Picture</label>
+                                    <div class="col-lg-7 col-md-8">
+                                        <input name="image" type="file" accept="image/*"/>
+                                    </div>
+                                </div>
+                                <div class="form-group row o_form_buttons">
+                                    <div class="offset-lg-3 offset-md-4 col-md-8 col-lg-7">
+                                        <button type="submit" class="btn btn-primary">Submit Proposal</button>
+                                    </div>
+                                </div>
+                            </form>
+                        </section>
+                    </div>
+                    <div t-else="">
+                        <t t-call="website_event_track.event_track_proposal_success"/>
+                    </div>
+                    <div class="oe_structure" id="oe_structure_website_event_track_proposal_2"/>
+                </div>
+                <div class="col-lg-3">
+                    <div class="card mb-3 bg-secondary">
+                        <h4 class="card-header">Talks Types</h4>
+                        <div class="card-body">
+                            <ul class="list-unstyled">
+                                <li>
+                                    <strong>Regular Talks</strong>. These are standard talks with slides,
+                                    alocated in slots of 60 minutes.
+                                </li><li>
+                                    <strong>Lightning Talks</strong>. These are 30 minutes talks on many
+                                    different topics. Most topics are accepted in lightning talks.
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="card bg-secondary">
+                        <h4 class="card-header">Submission Agreement</h4>
+                        <div class="card-body">
+                            <p>
+                            We require speakers to accept an agreement in which they commit to:
+                            </p>
+                            <ul class="list-unstyled">
+                                <li>
+                                    Timely release of presentation material (slides),
+                                    for publishing on our website.
+                                </li><li>
+                                    Allow video and audio recording of their
+                                    presentation, for publishing on our website.
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+        <div class="oe_structure" id="oe_structure_website_event_track_proposal_3"/>
+    </t>
+</template>
+
+<template id="event_track_proposal_success">
+    <section class="mt-5">
+        <h3 class="o_page_header">Application</h3>
+        <p>
+            Thank you for your proposal.
+        </p><p>
+            We will evaluate your proposition and get back to you shortly.
+        </p>
+    </section>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/event_track_templates_reminder.xml b/addons/website_event_track/views/event_track_templates_reminder.xml
similarity index 100%
rename from addons/website_event_track_online/views/event_track_templates_reminder.xml
rename to addons/website_event_track/views/event_track_templates_reminder.xml
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index 79cc864a5c7..58ff291a2a4 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -1,378 +1,287 @@
 <?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>
 
-        <!-- Event Tracks -->
-        <record model="ir.ui.view" id="view_event_track_kanban">
-            <field name="name">event.track.kanban</field>
-            <field name="model">event.track</field>
-            <field name="arch" type="xml">
-                <kanban default_group_by="stage_id">
-                    <templates>
-                        <field name="color"/>
-                        <field name="partner_id"/>
-                        <field name="stage_id"/>
-                        <field name="website_url"/>
-                        <field name="activity_ids"/>
-                        <field name="activity_state"/>
-                        <progressbar field="kanban_state" colors='{"done": "success", "blocked": "danger"}'/>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click">
-                                <div class="o_dropdown_kanban dropdown" groups="base.group_user">
-
-                                    <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
-                                        <span class="fa fa-ellipsis-v"/>
-                                    </a>
-                                    <div class="dropdown-menu" role="menu">
-                                        <a role="menuitem" t-att-href="record.website_url.value" class="dropdown-item">View Track</a>
-                                        <t t-if="widget.editable"><a role="menuitem" type="edit" class="dropdown-item">Edit Track</a></t>
-                                        <t t-if="widget.deletable"><a role="menuitem" type="delete" class="dropdown-item">Delete</a></t>
-                                        <ul class="oe_kanban_colorpicker" data-field="color"/>
-                                    </div>
-                                </div>
-                                <div class="oe_kanban_content">
-                                    <div class="o_kanban_record_top">
-                                        <h4 class="o_kanban_record_title"><field name="name"/></h4>
-                                    </div>
-                                    <div class="o_kanban_record_body">
-                                        <t t-if="duration"><field name="duration" widget="float_time"/> hours</t>
-                                        <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
-                                    </div>
-                                    <div class="o_kanban_record_bottom">
-                                        <div class="oe_kanban_bottom_left">
-                                            <field name="priority" widget="priority"/>
-                                            <field name="activity_ids" widget="kanban_activity"/>
-                                        </div>
-                                        <div class="oe_kanban_bottom_right">
-                                            <field name="kanban_state" widget="state_selection" groups="base.group_user"/>
-                                            <img t-att-src="kanban_image('res.partner', 'image_128', record.partner_id.raw_value)"
-                                                t-att-title="record.partner_id.value" t-att-alt="record.partner_id.value"
-                                                class="oe_kanban_avatar"/>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="view_event_track_calendar" model="ir.ui.view">
-            <field name="name">event.track.calendar</field>
-            <field name="model">event.track</field>
-            <field eval="2" name="priority"/>
-            <field name="arch" type="xml">
-                <calendar date_start="date" date_delay="duration" string="Event Tracks" color="location_id" event_limit="5">
-                    <field name="location_id" filters="1"/>
-                    <field name="event_id"/>
-                    <field name="partner_id" avatar_field="image_128"/>
-                    <field name="user_id" avatar_field="image_128"/>
-                </calendar>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_event_track_search">
-            <field name="name">event.track.search</field>
-            <field name="model">event.track</field>
-            <field name="arch" type="xml">
-                <search string="Event Tracks">
-                    <field name="name"/>
-                    <field name="event_id"/>
-                    <field name="location_id"/>
-                    <field name="stage_id"/>
+    <record model="ir.ui.view" id="view_event_track_kanban">
+        <field name="name">event.track.kanban</field>
+        <field name="model">event.track</field>
+        <field name="arch" type="xml">
+            <kanban default_group_by="stage_id">
+                <templates>
+                    <field name="color"/>
                     <field name="partner_id"/>
-                    <filter string="My Tracks" name="my_tracks" domain="[('user_id', '=', uid)]"/>
-                    <separator/>
-                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
-                    <separator/>
-                    <filter name="filter_date" date="date"/>
-                    <separator/>
-                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-                    <separator/>
-                    <filter invisible="1" string="Late Activities" name="activities_overdue"
-                        domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
-                        help="Show all records which has next action date is before today"/>
-                    <filter invisible="1" string="Today Activities" name="activities_today"
-                        domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
-                    <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
-                    <group expand="0" string="Group By">
-                        <filter string="Responsible" name="responsible" context="{'group_by': 'user_id'}"/>
-                        <filter string="Stage" name="stage" context="{'group_by': 'stage_id'}"/>
-                        <filter string="Date" name="date" context="{'group_by': 'date'}"/>
-                        <filter string="Event" name="event" context="{'group_by': 'event_id'}"/>
-                        <filter string="Location" name="location" context="{'group_by': 'location_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_event_track_form">
-            <field name="name">event.track.form</field>
-            <field name="model">event.track</field>
-            <field name="arch" type="xml">
-                <form string="Event Track">
-                    <header>
-                        <field name="stage_id" widget="statusbar" options="{'clickable': '1'}"/>
-                    </header>
-                    <sheet string="Track">
-                        <div class="oe_button_box" name="button_box">
-                            <field name="website_url" invisible="1"/>
-                            <field name="is_published" widget="website_redirect_button"/>
-                        </div>
-                        <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
-                        <field name="kanban_state" widget="state_selection" class="ml-3 float-right"/>
-                        <field name="image" widget="image" class="oe_avatar"/>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only"/>
-                            <h1>
-                                <field name="name" placeholder="e.g. Inspiring Business Talk"/>
-                            </h1>
-                        </div>
-                        <group>
-                            <group>
-                                <field name="date"/>
-                                <field name="location_id"/>
-                                <label for="duration"/>
-                                <div class="o_row">
-                                    <field name="duration" widget="float_time"/>
-                                    <span>hours</span>
-                                </div>
-                                <field name="active" invisible="1"/>
-                            </group>
-                            <group>
-                                <field name="company_id" invisible="1"/>
-                                <field name="user_id" domain="[('share', '=', False)]"/>
-                                <field name="event_id"/>
-                                <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
-                                <field name="color" widget="color_picker"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page string="Speakers" name="speakers">
-                                <group>
-                                    <field name="partner_id"
-                                        domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"
-                                        context="{'default_phone': partner_phone, 'default_email': partner_email}"/>
-                                    <field name="partner_name"/>
-                                    <field name="partner_email"/>
-                                    <field name="partner_phone" class="o_force_ltr"/>
-                                    <field name="partner_biography"/>
-                                </group>
-                            </page>
-                            <page string="Description" name="description">
-                                <field name="description"/>
-                            </page>
-                        </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="activity_ids"/>
-                        <field name="message_ids" options="{'post_refresh': 'recipients'}"/>
-                    </div>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_event_track_tree">
-            <field name="name">event.track.tree</field>
-            <field name="model">event.track</field>
-            <field name="arch" type="xml">
-                <tree string="Event Track">
-                    <field name="name"/>
-                    <field name="active" invisible="1"/>
-                    <field name="partner_name"/>
-                    <field name="partner_id" optional="hide"/>
-                    <field name="partner_email"/>
-                    <field name="partner_phone"/>
-                    <field name="event_id" invisible="context.get('default_event_id')"/>
                     <field name="stage_id"/>
-                    <field name="color" widget="color_picker" optional="hide"/>
-                    <field name="activity_exception_decoration" widget="activity_exception"/>
-                </tree>
-            </field>
-        </record>
+                    <field name="website_url"/>
+                    <field name="activity_ids"/>
+                    <field name="activity_state"/>
+                    <progressbar field="kanban_state" colors='{"done": "success", "blocked": "danger"}'/>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click">
+                            <div class="o_dropdown_kanban dropdown" groups="base.group_user">
 
-        <record model="ir.ui.view" id="view_event_track_graph">
-            <field name="name">event.track.graph</field>
-            <field name="model">event.track</field>
-            <field name="arch" type="xml">
-                <graph string="Tracks" type="bar" orientation="horizontal" sample="1">
-                    <field name="location_id"/>
-                    <field name="duration" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_event_track">
-            <field name="name">Event Tracks</field>
-            <field name="res_model">event.track</field>
-            <field name="view_mode">kanban,tree,form,calendar,graph,activity</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                  Add a new track
-                </p><p>
-                  Tracks define the schedule of your event.<br/>These can be a talk, a round table, a meeting, etc.
-                </p>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_event_track_from_event">
-            <field name="res_model">event.track</field>
-            <field name="name">Event Tracks</field>
-            <field name="view_mode">kanban,tree,form,calendar,graph,activity</field>
-            <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
-            <field name="help" type="html">
-              <p class="o_view_nocontent_smiling_face">
-                Add a new track
-              </p><p>
-                Tracks define the schedule of your event.<br/>These can be a talk, a round table, a meeting, etc.
-              </p>
-            </field>
-        </record>
-
-        <!-- EVENTS/CONFIGURATION/EVENT locations -->
-        <record model="ir.ui.view" id="view_event_location_form">
-            <field name="name">Event Locations</field>
-            <field name="model">event.track.location</field>
-            <field name="arch" type="xml">
-                <form string="Event Locations">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_event_location_tree">
-            <field name="name">Event Location</field>
-            <field name="model">event.track.location</field>
-            <field name="arch" type="xml">
-                <tree string="Event Location" editable="bottom">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_event_track_location">
-            <field name="name">Event Locations</field>
-            <field name="res_model">event.track.location</field>
-        </record>
-
-        <!-- EVENTS/CONFIGURATION/EVENT Tags -->
-        <record model="ir.ui.view" id="view_event_track_tag_form">
-            <field name="name">Track Tags</field>
-            <field name="model">event.track.tag</field>
-            <field name="arch" type="xml">
-                <form string="Event Track Tag">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_event_track_tag_tree">
-            <field name="name">Tracks Tag</field>
-            <field name="model">event.track.tag</field>
-            <field name="arch" type="xml">
-                <tree string="Event Track Tag" editable="bottom">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_event_track_tag">
-            <field name="name">Track Tags</field>
-            <field name="res_model">event.track.tag</field>
-        </record>
-
-        <!-- EVENTS TRACK STAGES-->
-        <record id="event_track_stage_view_search" model="ir.ui.view">
-            <field name="name">event.track.stage.view.search</field>
-            <field name="model">event.track.stage</field>
-            <field name="arch" type="xml">
-                <search string="Track Stage">
-                   <field name="name" string="Track Stages"/>
-                </search>
-            </field>
-        </record>
-
-        <record id="event_track_stage_view_form" model="ir.ui.view">
-            <field name="name">event.track.stage.view.form</field>
-            <field name="model">event.track.stage</field>
-            <field name="arch" type="xml">
-                <form string="Track Stage">
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="mail_template_id"/>
-                                <field name="sequence" groups="base.group_no_one"/>
-                            </group>
-                            <group>
-                                <field name="fold"/>
-                                <field name="is_done"/>
-                                <field name="is_cancel"/>
-                                <field name="color" widget="color_picker"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="event_track_stage_view_tree" model="ir.ui.view">
-            <field name="name">event.track.stage.view.tree</field>
-            <field name="model">event.track.stage</field>
-            <field name="arch" type="xml">
-                <tree string="Track Stage">
-                    <field name="sequence" widget="handle" groups="event.group_event_manager"/>
-                    <field name="name"/>
-                    <field name="fold"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_event_track_stage_kanban" model="ir.ui.view">
-            <field name="name">event.track.stage.kanban</field>
-            <field name="model">event.track.stage</field>
-            <field name="arch" type="xml">
-                <kanban>
-                    <field name="name"/>
-                    <field name="fold"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_global_click">
-                                <div>
-                                    <strong class="o_kanban_record_title"><field name="name"/></strong>
+                                <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
+                                    <span class="fa fa-ellipsis-v"/>
+                                </a>
+                                <div class="dropdown-menu" role="menu">
+                                    <a role="menuitem" t-att-href="record.website_url.value" class="dropdown-item">View Track</a>
+                                    <t t-if="widget.editable"><a role="menuitem" type="edit" class="dropdown-item">Edit Track</a></t>
+                                    <t t-if="widget.deletable"><a role="menuitem" type="delete" class="dropdown-item">Delete</a></t>
+                                    <ul class="oe_kanban_colorpicker" data-field="color"/>
                                 </div>
                             </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
+                            <div class="oe_kanban_content">
+                                <div class="o_kanban_record_top">
+                                    <h4 class="o_kanban_record_title"><field name="name"/></h4>
+                                </div>
+                                <div class="o_kanban_record_body">
+                                    <t t-if="duration"><field name="duration" widget="float_time"/> hours</t>
+                                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                                </div>
+                                <div class="o_kanban_record_bottom">
+                                    <div class="oe_kanban_bottom_left">
+                                        <field name="priority" widget="priority"/>
+                                        <field name="activity_ids" widget="kanban_activity"/>
+                                    </div>
+                                    <div class="oe_kanban_bottom_right">
+                                        <field name="kanban_state" widget="state_selection" groups="base.group_user"/>
+                                        <img t-att-src="kanban_image('res.partner', 'image_128', record.partner_id.raw_value)"
+                                            t-att-title="record.partner_id.value" t-att-alt="record.partner_id.value"
+                                            class="oe_kanban_avatar"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
 
-        <record id="event_track_stage_action" model="ir.actions.act_window">
-            <field name="name">Track Stages</field>
-            <field name="res_model">event.track.stage</field>
-            <field name="view_mode">tree,kanban,form</field>
-            <field name="view_id" ref="event_track_stage_view_tree"/>
-            <field name="help" type="html">
-              <p class="o_view_nocontent_smiling_face">
-                Add a new stage in the task pipeline
-              </p><p>
-                Define the steps that will be used in the event from the
-                creation of the track, up to the closing of the track.
-                You will use these stages in order to track the progress in
-                solving an event track.
-              </p>
-            </field>
-        </record>
+    <record id="view_event_track_calendar" model="ir.ui.view">
+        <field name="name">event.track.calendar</field>
+        <field name="model">event.track</field>
+        <field eval="2" name="priority"/>
+        <field name="arch" type="xml">
+            <calendar date_start="date" date_delay="duration" string="Event Tracks" color="location_id" event_limit="5">
+                <field name="location_id" filters="1"/>
+                <field name="event_id"/>
+                <field name="partner_id" avatar_field="image_128"/>
+                <field name="user_id" avatar_field="image_128"/>
+            </calendar>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_event_track_search">
+        <field name="name">event.track.search</field>
+        <field name="model">event.track</field>
+        <field name="arch" type="xml">
+            <search string="Event Tracks">
+                <field name="name"/>
+                <field name="event_id"/>
+                <field name="location_id"/>
+                <field name="stage_id"/>
+                <field name="partner_id"/>
+                <filter string="My Tracks" name="my_tracks" domain="[('user_id', '=', uid)]"/>
+                <separator/>
+                <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
+                <separator/>
+                <filter string="Always Wishlisted" name="filter_wishlisted_by_default" domain="[('wishlisted_by_default', '=', True)]"/>
+                <separator/>
+                <filter name="filter_date" date="date"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                <separator/>
+                <filter invisible="1" string="Late Activities" name="activities_overdue"
+                    domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                    help="Show all records which has next action date is before today"/>
+                <filter invisible="1" string="Today Activities" name="activities_today"
+                    domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
+                <group expand="0" string="Group By">
+                    <filter string="Responsible" name="responsible" context="{'group_by': 'user_id'}"/>
+                    <filter string="Stage" name="stage" context="{'group_by': 'stage_id'}"/>
+                    <filter string="Date" name="date" context="{'group_by': 'date'}"/>
+                    <filter string="Event" name="event" context="{'group_by': 'event_id'}"/>
+                    <filter string="Location" name="location" context="{'group_by': 'location_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_event_track_form">
+        <field name="name">event.track.form</field>
+        <field name="model">event.track</field>
+        <field name="arch" type="xml">
+            <form string="Event Track">
+                <header>
+                    <field name="stage_id" widget="statusbar" options="{'clickable': '1'}"/>
+                </header>
+                <sheet string="Track">
+                    <div class="oe_button_box" name="button_box">
+                        <field name="website_url" invisible="1"/>
+                        <button name="%(website_event_track.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 name="is_published" widget="website_redirect_button"/>
+                    </div>
+                    <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                    <field name="kanban_state" widget="state_selection" class="ml-3 float-right"/>
+                    <field name="website_image" widget="image" class="oe_avatar"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name" placeholder="e.g. Inspiring Business Talk"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="date"/>
+                            <field name="location_id"/>
+                            <label for="duration"/>
+                            <div class="o_row">
+                                <field name="duration" widget="float_time"/>
+                                <span>hours</span>
+                            </div>
+                            <field name="active" invisible="1"/>
+                            <field name="wishlisted_by_default"/>
+                        </group>
+                        <group>
+                            <field name="company_id" invisible="1"/>
+                            <field name="user_id" domain="[('share', '=', False)]"/>
+                            <field name="event_id"/>
+                            <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                            <field name="color" widget="color_picker"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Speakers" name="speakers">
+                            <group>
+                                <field name="partner_id"
+                                    domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"
+                                    context="{'default_phone': partner_phone, 'default_email': partner_email}"/>
+                                <field name="partner_name"/>
+                                <field name="partner_email"/>
+                                <field name="partner_phone" class="o_force_ltr"/>
+                                <field name="partner_biography"/>
+                                <field name="image" widget="image" class="oe_avatar float-left"/>
+                            </group>
+                        </page>
+                        <page string="Description" name="description">
+                            <field name="description"/>
+                        </page>
+                        <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>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="activity_ids"/>
+                    <field name="message_ids" options="{'post_refresh': 'recipients'}"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_event_track_tree">
+        <field name="name">event.track.tree</field>
+        <field name="model">event.track</field>
+        <field name="arch" type="xml">
+            <tree string="Event Track">
+                <field name="name"/>
+                <field name="active" invisible="1"/>
+                <field name="partner_name"/>
+                <field name="partner_id" optional="hide"/>
+                <field name="partner_email"/>
+                <field name="partner_phone"/>
+                <field name="event_id" invisible="context.get('default_event_id')"/>
+                <field name="wishlisted_by_default" optional="hide"/>
+                <field name="wishlist_visitor_count" optional="hide"/>
+                <field name="stage_id"/>
+                <field name="color" widget="color_picker" optional="hide"/>
+                <field name="activity_exception_decoration" widget="activity_exception"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_event_track_graph">
+        <field name="name">event.track.graph</field>
+        <field name="model">event.track</field>
+        <field name="arch" type="xml">
+            <graph string="Tracks" type="bar" orientation="horizontal" sample="1">
+                <field name="location_id"/>
+                <field name="duration" operator="+"/>
+            </graph>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_event_track">
+        <field name="name">Event Tracks</field>
+        <field name="res_model">event.track</field>
+        <field name="view_mode">kanban,tree,form,calendar,graph,activity</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+              Add a new track
+            </p><p>
+              Tracks define the schedule of your event.<br/>These can be a talk, a round table, a meeting, etc.
+            </p>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_event_track_from_event">
+        <field name="res_model">event.track</field>
+        <field name="name">Event Tracks</field>
+        <field name="view_mode">kanban,tree,form,calendar,graph,activity</field>
+        <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
+        <field name="help" type="html">
+          <p class="o_view_nocontent_smiling_face">
+            Add a new track
+          </p><p>
+            Tracks define the schedule of your event.<br/>These can be a talk, a round table, a meeting, etc.
+          </p>
+        </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/views/event_track_visitor_views.xml
similarity index 100%
rename from addons/website_event_track_online/views/event_track_visitor_views.xml
rename to addons/website_event_track/views/event_track_visitor_views.xml
diff --git a/addons/website_event_track/views/event_type_views.xml b/addons/website_event_track/views/event_type_views.xml
new file mode 100644
index 00000000000..1c49a0438d3
--- /dev/null
+++ b/addons/website_event_track/views/event_type_views.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="event_type_view_form_inherit_track" model="ir.ui.view">
+        <field name="name">event.type.view.form.inherit.track</field>
+        <field name="model">event.type</field>
+        <field name="inherit_id" ref="website_event.event_type_view_form"/>
+        <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="website_track"/> <field name="website_track"/>
+                </div>
+                <div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
+                    <label class="col-lg-4" for="website_track_proposal"/> <field name="website_track_proposal"/>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/website_event_track/views/website_templates.xml b/addons/website_event_track/views/website_templates.xml
new file mode 100644
index 00000000000..30ef790214e
--- /dev/null
+++ b/addons/website_event_track/views/website_templates.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="track_edit_options" inherit_id="website.user_navbar" name="Edit Track Options">
+    <xpath expr="//li[@id='edit-page-menu']" position="after">
+        <t t-if="main_object._name == 'event.track'" t-set="action" t-value="'website_event_track.action_event_track'" />
+    </xpath>
+</template>
+
+</odoo>
diff --git a/addons/website_event_track_online/views/website_visitor_views.xml b/addons/website_event_track/views/website_visitor_views.xml
similarity index 85%
rename from addons/website_event_track_online/views/website_visitor_views.xml
rename to addons/website_event_track/views/website_visitor_views.xml
index c5ee8456984..171186d73ca 100644
--- a/addons/website_event_track_online/views/website_visitor_views.xml
+++ b/addons/website_event_track/views/website_visitor_views.xml
@@ -4,7 +4,7 @@
     <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="inherit_id" ref="website_event.website_visitor_view_tree"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='event_registration_count']" position="after">
                 <field name="event_track_wishlisted_count"/>
@@ -15,10 +15,10 @@
     <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="inherit_id" ref="website_event.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"
+                <button name="%(website_event_track.event_track_action_from_visitor)d"
                     type="action"
                     class="oe_stat_button" icon="fa-ticket"
                     attrs="{'invisible': [('event_track_wishlisted_count', '=', 0)]}">
@@ -31,7 +31,7 @@
     <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="inherit_id" ref="website_event.website_visitor_view_kanban"/>
         <field name="arch" type="xml">
             <field name="page_ids" position="after">
                 <field name="event_track_wishlisted_count"/>
diff --git a/addons/website_event_track_exhibitor/__manifest__.py b/addons/website_event_track_exhibitor/__manifest__.py
index 9fd2503da71..b2f9f8de957 100644
--- a/addons/website_event_track_exhibitor/__manifest__.py
+++ b/addons/website_event_track_exhibitor/__manifest__.py
@@ -11,7 +11,7 @@
     'website': 'https://www.odoo.com/page/events',
     'description': "",
     'depends': [
-        'website_event_track_online',
+        'website_event_track',
         'website_jitsi',
     ],
     'data': [
diff --git a/addons/website_event_track_exhibitor/controllers/exhibitor.py b/addons/website_event_track_exhibitor/controllers/exhibitor.py
index 9e37ae03d2e..4f96c90e2da 100644
--- a/addons/website_event_track_exhibitor/controllers/exhibitor.py
+++ b/addons/website_event_track_exhibitor/controllers/exhibitor.py
@@ -6,12 +6,12 @@ from random import randint, sample
 from werkzeug.exceptions import NotFound, Forbidden
 
 from odoo import exceptions, http
-from odoo.addons.website_event_track.controllers.main import WebsiteEventTrackController
+from odoo.addons.website_event_track.controllers.event_track import EventTrackController
 from odoo.http import request
 from odoo.osv import expression
 
 
-class ExhibitorController(WebsiteEventTrackController):
+class ExhibitorController(EventTrackController):
 
     def _get_event_sponsors_base_domain(self, event):
         search_domain_base = [
diff --git a/addons/website_event_track_exhibitor/models/website_event_menu.py b/addons/website_event_track_exhibitor/models/website_event_menu.py
index ce37fadbbf5..5926607ef48 100644
--- a/addons/website_event_track_exhibitor/models/website_event_menu.py
+++ b/addons/website_event_track_exhibitor/models/website_event_menu.py
@@ -7,4 +7,6 @@ from odoo import fields, models
 class EventMenu(models.Model):
     _inherit = "website.event.menu"
 
-    menu_type = fields.Selection(selection_add=[('exhibitor', 'Exhibitors Menus')])
+    menu_type = fields.Selection(
+        selection_add=[('exhibitor', 'Exhibitors Menus')],
+        ondelete={'exhibitor': 'cascade'})
diff --git a/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py b/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py
index 7856eb8e091..e011510662d 100644
--- a/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py
+++ b/addons/website_event_track_exhibitor/tests/test_sponsor_internals.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from datetime import date, datetime, timedelta
+from datetime import datetime
+from unittest.mock import patch
 
-from odoo.addons.website_event_track_online.tests.common import TestEventTrackOnlineCommon
+from odoo.addons.website_event_track.tests.common import TestEventTrackOnlineCommon
+from odoo.fields import Datetime as FieldsDatetime
 from odoo.tests.common import users
 
 
@@ -18,6 +20,14 @@ class TestSponsorData(TestEventTrackOnlineCommon):
             'hour_to': 18.0,
         })
 
+        cls.wevent_exhib_dt = patch(
+            'odoo.addons.website_event_track_exhibitor.models.event_sponsor.fields.Datetime',
+            wraps=FieldsDatetime
+        )
+        cls.mock_wevent_exhib_dt = cls.wevent_exhib_dt.start()
+        cls.mock_wevent_exhib_dt.now.return_value = cls.reference_now
+        cls.addClassCleanup(cls.wevent_exhib_dt.stop)
+
     @users('user_eventmanager')
     def test_event_date_computation(self):
         """ Test date computation. Pay attention that mocks returns UTC values, meaning
@@ -29,42 +39,48 @@ class TestSponsorData(TestEventTrackOnlineCommon):
         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)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 6, 7, 0, 0)
+        self.mock_wevent_exhib_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)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 6, 6, 0, 0)
+        self.mock_wevent_exhib_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)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 6, 5, 59, 59)
+        self.mock_wevent_exhib_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)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 6, 18, 0, 0)
+        self.mock_wevent_exhib_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)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 5, 6, 30, 0)
+        self.mock_wevent_exhib_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)
+        self.mock_wevent_dt.now.return_value = datetime(2020, 7, 7, 13, 0, 1)
+        self.mock_wevent_exhib_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)
diff --git a/addons/website_event_track_exhibitor/views/event_event_views.xml b/addons/website_event_track_exhibitor/views/event_event_views.xml
index ff33ca4d6a8..2c151398461 100644
--- a/addons/website_event_track_exhibitor/views/event_event_views.xml
+++ b/addons/website_event_track_exhibitor/views/event_event_views.xml
@@ -2,7 +2,7 @@
 <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="inherit_id" ref="website_event_track.event_event_view_form"/>
         <field name="model">event.event</field>
         <field name="priority" eval="3"/>
         <field name="arch" type="xml">
diff --git a/addons/website_event_track_exhibitor/views/event_sponsor_views.xml b/addons/website_event_track_exhibitor/views/event_sponsor_views.xml
index 268342973b7..511ed56b884 100644
--- a/addons/website_event_track_exhibitor/views/event_sponsor_views.xml
+++ b/addons/website_event_track_exhibitor/views/event_sponsor_views.xml
@@ -3,7 +3,7 @@
     <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="inherit_id" ref="website_event_track.event_sponsor_view_search"/>
         <field name="arch" type="xml">
             <xpath expr="//filter[@name='archived']" position="after">
                 <separator/>
@@ -15,7 +15,7 @@
     <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="inherit_id" ref="website_event_track.event_sponsor_view_tree"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='sponsor_type_id']" position="after">
                 <field name="is_published" optional="show"/>
@@ -38,7 +38,7 @@
     <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="inherit_id" ref="website_event_track.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">
diff --git a/addons/website_event_track_exhibitor/views/event_type_views.xml b/addons/website_event_track_exhibitor/views/event_type_views.xml
index ab2ffe85c81..517285d2dc6 100644
--- a/addons/website_event_track_exhibitor/views/event_type_views.xml
+++ b/addons/website_event_track_exhibitor/views/event_type_views.xml
@@ -3,7 +3,7 @@
     <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="inherit_id" ref="website_event.event_type_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='website_menu']" position='after'>
                 <div class="row mt16" attrs="{'invisible': [('website_menu', '=', False)]}">
diff --git a/addons/website_event_track_live/__manifest__.py b/addons/website_event_track_live/__manifest__.py
index 8f137e270e2..be28bb71b0b 100644
--- a/addons/website_event_track_live/__manifest__.py
+++ b/addons/website_event_track_live/__manifest__.py
@@ -11,8 +11,7 @@
     'website': 'https://www.odoo.com/page/events',
     'description': "",
     'depends': [
-        'website_event_track_online',
-        'website_event_track_session',
+        'website_event_track',
     ],
     'data': [
         'views/assets.xml',
diff --git a/addons/website_event_track_live/controllers/session.py b/addons/website_event_track_live/controllers/session.py
index 9d6381e6300..ea8cc5411a4 100644
--- a/addons/website_event_track_live/controllers/session.py
+++ b/addons/website_event_track_live/controllers/session.py
@@ -3,11 +3,11 @@
 
 import re
 
-from odoo.addons.website_event_track_session.controllers.session import WebsiteEventSessionController
+from odoo.addons.website_event_track.controllers.event_track import EventTrackController
 from odoo.http import request
 
 
-class WebsiteEventSessionLiveController(WebsiteEventSessionController):
+class WebsiteEventSessionLiveController(EventTrackController):
 
     def _event_track_page_get_values(self, event, track, **options):
         if 'widescreen' not in options:
diff --git a/addons/website_event_track_live/controllers/track_live.py b/addons/website_event_track_live/controllers/track_live.py
index d85d3d13c79..1fcbba24fec 100644
--- a/addons/website_event_track_live/controllers/track_live.py
+++ b/addons/website_event_track_live/controllers/track_live.py
@@ -3,10 +3,10 @@
 
 from odoo import http
 
-from odoo.addons.website_event_track_online.controllers.event_track import EventTrackOnlineController
+from odoo.addons.website_event_track.controllers.event_track import EventTrackController
 
 
-class EventTrackLiveController(EventTrackOnlineController):
+class EventTrackLiveController(EventTrackController):
 
     @http.route('/event_track/get_track_suggestion', type='json', auth='public', website=True)
     def get_next_track_suggestion(self, track_id):
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
index 9f6236b6bfb..844620dd44f 100644
--- a/addons/website_event_track_live/views/event_track_templates_list.xml
+++ b/addons/website_event_track_live/views/event_track_templates_list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="tracks_display_list" inherit_id="website_event_track_session.tracks_display_list">
+<template id="tracks_display_list" inherit_id="website_event_track.tracks_display_list">
     <!-- TRACK LIST: ADD REPLAY TAG FOR FINISHED TRACKS -->
     <xpath expr="//div[hasclass('o_wesession_list_item')]/div[hasclass('col-md-5')]//t[@t-elif='not track.is_track_done and not track.is_track_soon']" position="after">
         <a t-elif="track.youtube_video_url and (track.is_published or user_event_manager)"
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
index f72152f6e71..1ac7dfd2748 100644
--- a/addons/website_event_track_live/views/event_track_templates_page.xml
+++ b/addons/website_event_track_live/views/event_track_templates_page.xml
@@ -2,7 +2,7 @@
 <odoo>
 
 <!-- MAIN: REMOVE HEADER/FOOTER IF WIDESCREEN -->
-<template id="event_track_main" inherit_id="website_event_track_session.event_track_main">
+<template id="event_track_main" inherit_id="website_event_track.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"/>
@@ -10,7 +10,7 @@
 </template>
 
 <!-- MAIN: ADD VIDEO -->
-<template id="event_track_content" inherit_id="website_event_track_session.event_track_content">
+<template id="event_track_content" inherit_id="website_event_track.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>
@@ -31,7 +31,7 @@
 </template>
 
 <!-- ASIDE: ADD CHAT TAB FOR VIDEOS -->
-<template id="event_track_aside" inherit_id="website_event_track_session.event_track_aside">
+<template id="event_track_aside" inherit_id="website_event_track.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">
diff --git a/addons/website_event_track_online/__init__.py b/addons/website_event_track_online/__init__.py
deleted file mode 100644
index 5a31f331a2a..00000000000
--- a/addons/website_event_track_online/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- 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
deleted file mode 100644
index 8ad731cd362..00000000000
--- a/addons/website_event_track_online/__manifest__.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- 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
deleted file mode 100644
index 074cc5bfa61..00000000000
--- a/addons/website_event_track_online/controllers/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- 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/event_track.py b/addons/website_event_track_online/controllers/event_track.py
deleted file mode 100644
index 8df8b5deb5c..00000000000
--- a/addons/website_event_track_online/controllers/event_track.py
+++ /dev/null
@@ -1,276 +0,0 @@
-# -*- 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.http_routing.models.ir_http import url_for
-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.filtered(lambda track: track.date)
-        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': url_for('/event'),
-            'start_url': url_for('/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', url_for('/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
deleted file mode 100644
index f2576038acf..00000000000
--- a/addons/website_event_track_online/data/event_sponsor_demo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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
deleted file mode 100644
index da1a8915d8a..00000000000
--- a/addons/website_event_track_online/data/event_sponsor_type_data.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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
deleted file mode 100644
index 2b63d8c1c44..00000000000
--- a/addons/website_event_track_online/data/event_track_demo.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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
deleted file mode 100644
index b9f12bf3b82..00000000000
--- a/addons/website_event_track_online/data/event_track_stage_data.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
deleted file mode 100644
index 35408f450dc..00000000000
--- a/addons/website_event_track_online/data/event_track_tag_demo.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/models/__init__.py b/addons/website_event_track_online/models/__init__.py
deleted file mode 100644
index c8add27a1e3..00000000000
--- a/addons/website_event_track_online/models/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- 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
deleted file mode 100644
index 36899d5e86b..00000000000
--- a/addons/website_event_track_online/models/event_event.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- 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
deleted file mode 100644
index 16bec7c9fe4..00000000000
--- a/addons/website_event_track_online/models/event_sponsor.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- 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_track.py b/addons/website_event_track_online/models/event_track.py
deleted file mode 100644
index 511fbf404ff..00000000000
--- a/addons/website_event_track_online/models/event_track.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- 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)
-    partner_function = fields.Char(
-        'Job Position', related='partner_id.function',
-        compute_sudo=True, readonly=True)
-    partner_company_name = fields.Char(
-        'Company Name', related='partner_id.parent_name',
-        compute_sudo=True, readonly=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
deleted file mode 100644
index c6e300e5b55..00000000000
--- a/addons/website_event_track_online/models/event_track_stage.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- 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/website_event_menu.py b/addons/website_event_track_online/models/website_event_menu.py
deleted file mode 100644
index 97c17aff19a..00000000000
--- a/addons/website_event_track_online/models/website_event_menu.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- 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/security/ir.model.access.csv b/addons/website_event_track_online/security/ir.model.access.csv
deleted file mode 100644
index b0bd4100f47..00000000000
--- a/addons/website_event_track_online/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-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/src/js/website_event_customize_options.js b/addons/website_event_track_online/static/src/js/website_event_customize_options.js
deleted file mode 100644
index d86ef9db4b2..00000000000
--- a/addons/website_event_track_online/static/src/js/website_event_customize_options.js
+++ /dev/null
@@ -1,13 +0,0 @@
-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/xml/website_event_customize_options.xml b/addons/website_event_track_online/static/src/xml/website_event_customize_options.xml
deleted file mode 100644
index 22d5e2fd836..00000000000
--- a/addons/website_event_track_online/static/src/xml/website_event_customize_options.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/tests/__init__.py b/addons/website_event_track_online/tests/__init__.py
deleted file mode 100644
index 511e649c9e2..00000000000
--- a/addons/website_event_track_online/tests/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- 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/views/event_event_views.xml b/addons/website_event_track_online/views/event_event_views.xml
deleted file mode 100644
index c1aa910cc07..00000000000
--- a/addons/website_event_track_online/views/event_event_views.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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
deleted file mode 100644
index f8a69e4d6ef..00000000000
--- a/addons/website_event_track_online/views/event_menus.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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
deleted file mode 100644
index 31e986fd2f9..00000000000
--- a/addons/website_event_track_online/views/event_sponsor_type_views.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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
deleted file mode 100644
index 6dd681d7fab..00000000000
--- a/addons/website_event_track_online/views/event_sponsor_views.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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="//tree" position="attributes">
-                <attribute name="multi_edit">1</attribute>
-            </xpath>
-            <xpath expr="//field[@name='partner_id']" position="attributes">
-                <attribute name="readonly">1</attribute>
-            </xpath>
-            <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_track_stage_views.xml b/addons/website_event_track_online/views/event_track_stage_views.xml
deleted file mode 100644
index 9840a03cc8d..00000000000
--- a/addons/website_event_track_online/views/event_track_stage_views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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_templates.xml b/addons/website_event_track_online/views/event_track_templates.xml
deleted file mode 100644
index 08f95c92af3..00000000000
--- a/addons/website_event_track_online/views/event_track_templates.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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_views.xml b/addons/website_event_track_online/views/event_track_views.xml
deleted file mode 100644
index 5f2a40903ce..00000000000
--- a/addons/website_event_track_online/views/event_track_views.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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_type_views.xml b/addons/website_event_track_online/views/event_type_views.xml
deleted file mode 100644
index f3b28139ee7..00000000000
--- a/addons/website_event_track_online/views/event_type_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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_quiz/__manifest__.py b/addons/website_event_track_quiz/__manifest__.py
index 4aaacbe69f4..e1e71980282 100644
--- a/addons/website_event_track_quiz/__manifest__.py
+++ b/addons/website_event_track_quiz/__manifest__.py
@@ -12,7 +12,7 @@
     'description': "",
     'depends': [
         'website_profile',
-        'website_event_track_session',
+        'website_event_track',
     ],
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/website_event_track_quiz/controllers/community.py b/addons/website_event_track_quiz/controllers/community.py
index f10f8e9dffb..7748a2dc1db 100644
--- a/addons/website_event_track_quiz/controllers/community.py
+++ b/addons/website_event_track_quiz/controllers/community.py
@@ -5,11 +5,11 @@ 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.addons.website_event.controllers.community import EventCommunityController
 from odoo.http import request
 
 
-class WebsiteEventTrackQuizCommunityController(WebsiteEventCommunityController):
+class WebsiteEventTrackQuizCommunityController(EventCommunityController):
 
     _visitors_per_page = 30
     _pager_max_pages = 5
diff --git a/addons/website_event_track_quiz/controllers/event_track_quiz.py b/addons/website_event_track_quiz/controllers/event_track_quiz.py
index 2942313a680..f734952d147 100644
--- a/addons/website_event_track_quiz/controllers/event_track_quiz.py
+++ b/addons/website_event_track_quiz/controllers/event_track_quiz.py
@@ -2,11 +2,11 @@
 # 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.addons.website_event_track.controllers.event_track import EventTrackController
 from odoo.http import request
 
 
-class WebsiteEventTrackQuiz(WebsiteEventSessionController):
+class WebsiteEventTrackQuiz(EventTrackController):
 
     # QUIZZES IN PAGE
     # ----------------------------------------------------------
diff --git a/addons/website_event_track_quiz/data/quiz_demo.xml b/addons/website_event_track_quiz/data/quiz_demo.xml
index 6ff1f05b14f..ea0d73af800 100644
--- a/addons/website_event_track_quiz/data/quiz_demo.xml
+++ b/addons/website_event_track_quiz/data/quiz_demo.xml
@@ -141,21 +141,21 @@
 
     <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="visitor_id" ref="website_event.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="visitor_id" ref="website_event.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="visitor_id" ref="website_event.website_visitor_event_2"/>
         <field name="quiz_completed" eval="True"/>
         <field name="quiz_points">1</field>
     </record>
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
index e448cfd35dc..2a50df5e61c 100644
--- a/addons/website_event_track_quiz/views/event_track_templates_page.xml
+++ b/addons/website_event_track_quiz/views/event_track_templates_page.xml
@@ -3,7 +3,7 @@
 
 <template id="event_track_content"
     name="Track: Main Description: add quiz"
-    inherit_id="website_event_track_session.event_track_content">
+    inherit_id="website_event_track.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')"
diff --git a/addons/website_event_track_quiz/views/event_track_views.xml b/addons/website_event_track_quiz/views/event_track_views.xml
index d8d2f190735..13a0ceac999 100644
--- a/addons/website_event_track_quiz/views/event_track_views.xml
+++ b/addons/website_event_track_quiz/views/event_track_views.xml
@@ -3,7 +3,7 @@
     <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="inherit_id" ref="website_event_track.view_event_track_form"/>
         <field name="arch" type="xml">
             <xpath expr="//group[@name='event_track_cta_group']" position="after">
                 <group name="event_track_quiz_group">
diff --git a/addons/website_event_track_quiz/views/event_track_visitor_views.xml b/addons/website_event_track_quiz/views/event_track_visitor_views.xml
index 6b5bfe437b9..47f7e159015 100644
--- a/addons/website_event_track_quiz/views/event_track_visitor_views.xml
+++ b/addons/website_event_track_quiz/views/event_track_visitor_views.xml
@@ -4,7 +4,7 @@
     <record id="event_track_visitor_view_search" model="ir.ui.view" >
         <field name="name">event.track.visitor.view.search.inherit.quiz</field>
         <field name="model">event.track.visitor</field>
-        <field name="inherit_id" ref="website_event_track_online.event_track_visitor_view_search"/>
+        <field name="inherit_id" ref="website_event_track.event_track_visitor_view_search"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='is_wishlisted']" position="after">
                 <field name="quiz_completed"/>
@@ -15,7 +15,7 @@
     <record id="event_track_visitor_view_form" model="ir.ui.view">
         <field name="name">event.track.visitor.view.form.inherit.quiz</field>
         <field name="model">event.track.visitor</field>
-        <field name="inherit_id" ref="website_event_track_online.event_track_visitor_view_form"/>
+        <field name="inherit_id" ref="website_event_track.event_track_visitor_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='is_wishlisted']" position="after">
                 <field name="quiz_completed"/>
@@ -27,7 +27,7 @@
     <record id="event_track_visitor_view_list" model="ir.ui.view">
         <field name="name">event.track.visitor.view.list.inherit.quiz</field>
         <field name="model">event.track.visitor</field>
-        <field name="inherit_id" ref="website_event_track_online.event_track_visitor_view_list"/>
+        <field name="inherit_id" ref="website_event_track.event_track_visitor_view_list"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='is_wishlisted']" position="after">
                 <field name="quiz_completed"/>
diff --git a/addons/website_event_track_quiz/views/event_type_views.xml b/addons/website_event_track_quiz/views/event_type_views.xml
index 2fe00f48acf..5f5e01a0d58 100644
--- a/addons/website_event_track_quiz/views/event_type_views.xml
+++ b/addons/website_event_track_quiz/views/event_type_views.xml
@@ -3,7 +3,7 @@
     <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="inherit_id" ref="website_event.event_type_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='community-menu']" position="attributes">
                 <attribute name="groups"></attribute>
diff --git a/addons/website_event_track_session/__init__.py b/addons/website_event_track_session/__init__.py
deleted file mode 100644
index 5a31f331a2a..00000000000
--- a/addons/website_event_track_session/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- 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
deleted file mode 100644
index f9e3b627e0c..00000000000
--- a/addons/website_event_track_session/__manifest__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- 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
deleted file mode 100644
index 1c2ee57c54f..00000000000
--- a/addons/website_event_track_session/controllers/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- 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
deleted file mode 100644
index cbef2f048a6..00000000000
--- a/addons/website_event_track_session/controllers/session.py
+++ /dev/null
@@ -1,207 +0,0 @@
-# -*- 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 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),
-        ]
-        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", "[('website_track', '=', True)]"):event>/track''',
-        '''/event/<model("event.event", "[('website_track', '=', True)]"):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: announced, live, soon and day-based
-        tracks_announced = tracks_sudo.filtered(lambda track: not track.date)
-        tracks_wdate = tracks_sudo - tracks_announced
-        date_begin_tz_all = list(set(
-            dt.date()
-            for dt in self._get_dt_in_event_tz(tracks_wdate.mapped('date'), event)
-        ))
-        date_begin_tz_all.sort()
-        tracks_sudo_live = tracks_wdate.filtered(lambda track: track.is_published and track.is_track_live)
-        tracks_sudo_soon = tracks_wdate.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_tracks = tracks_wdate.filtered(lambda track: self._get_dt_in_event_tz([track.date], event)[0].date() == display_date)
-            tracks_by_day.append({'date': display_date, 'name': display_date, 'tracks': matching_tracks})
-        if tracks_announced:
-            tracks_announced = tracks_announced.sorted('wishlisted_by_default', reverse=True)
-            tracks_by_day.append({'date': False, 'name': _('Coming soon'), 'tracks': tracks_announced})
-
-        # 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", "[('website_track', '=', True)]"):event>/track/<model("event.track", "[('event_id', '=', event.id)]"):track>''',
-                type='http', auth="public", website=True, sitemap=True)
-    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_view(self, event, track, **post):
-        return self.event_track_page(event, track, **post)
-
-    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
deleted file mode 100644
index c9fd08ccd84..00000000000
--- a/addons/website_event_track_session/data/event_track_demo.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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
deleted file mode 100644
index e3798014924..00000000000
--- a/addons/website_event_track_session/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- 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
deleted file mode 100644
index 7e012156e38..00000000000
--- a/addons/website_event_track_session/models/event_track.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# -*- 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
-
-    @api.model_create_multi
-    def create(self, values_list):
-        for values in values_list:
-            if values.get('website_cta_url'):
-                values['website_cta_url'] = self.env['res.partner']._clean_website(values['website_cta_url'])
-        return super(EventTrack, self).create(values_list)
-
-    def write(self, values):
-        if values.get('website_cta_url'):
-            values['website_cta_url'] = self.env['res.partner']._clean_website(values['website_cta_url'])
-        return super(EventTrack, self).write(values)
-
-    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/tests/__init__.py b/addons/website_event_track_session/tests/__init__.py
deleted file mode 100644
index c4e08033d49..00000000000
--- a/addons/website_event_track_session/tests/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- 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/views/assets.xml b/addons/website_event_track_session/views/assets.xml
deleted file mode 100644
index fd9b752732e..00000000000
--- a/addons/website_event_track_session/views/assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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
deleted file mode 100644
index 6f9035fb7f5..00000000000
--- a/addons/website_event_track_session/views/event_track_templates_agenda.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="mx-1 badge badge-danger">Live
-        </small>
-    </xpath>
-</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
deleted file mode 100644
index 27bcf0b994c..00000000000
--- a/addons/website_event_track_session/views/event_track_templates_misc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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_views.xml b/addons/website_event_track_session/views/event_track_views.xml
deleted file mode 100644
index a80870faf2d..00000000000
--- a/addons/website_event_track_session/views/event_track_views.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>