diff --git a/addons/event/data/event_data.xml b/addons/event/data/event_data.xml
index a9ab41942a6..0c430e37799 100644
--- a/addons/event/data/event_data.xml
+++ b/addons/event/data/event_data.xml
@@ -21,18 +21,15 @@
             <field name="auto_confirm" eval="True"/>
             <field name="use_mail_schedule" eval="False"/>
         </record>
-        <record id="event_type_data_physical" model="event.type">
-            <field name="name">Physical Event</field>
-            <field name="is_online" eval="False"/>
-            <field name="auto_confirm" eval="True"/>
-            <field name="use_mail_schedule" eval="False"/>
-        </record>
         <record id="event_type_data_ticket" model="event.type">
             <field name="name">Ticketing</field>
             <field name="auto_confirm" eval="False"/>
-            <field name="use_mail_schedule" eval="True"/>
             <field name="use_ticket" eval="True"/>
         </record>
+        <record id="event_type_data_conference" model="event.type">
+            <field name="name">Conference</field>
+            <field name="auto_confirm" eval="True"/>
+        </record>
 
         <!-- Event stages -->
         <record id="event_stage_new" model="event.stage">
diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml
index 6cf245d577b..086b40eacc2 100644
--- a/addons/event/data/event_demo.xml
+++ b/addons/event/data/event_demo.xml
@@ -5,17 +5,24 @@
     <!-- Event Type -->
     <record id="event_type_0" model="event.type">
         <field name="name">Exhibition</field>
-        <field name="use_mail_schedule" eval="False"/>
         <field name="auto_confirm" eval="False"/>
+        <field name="use_mail_schedule" eval="False"/>
     </record>
     <record id="event_type_1" model="event.type">
         <field name="name">Training</field>
+        <field name="auto_confirm" eval="False"/>
         <field name="use_mail_schedule" eval="True"/>
-        <field name="auto_confirm" eval="True"/>
     </record>
     <record id="event_type_2" model="event.type">
         <field name="name">Sport</field>
+        <field name="auto_confirm" eval="False"/>
         <field name="use_mail_schedule" eval="False"/>
+        <field name="use_timezone" eval="True"/>
+        <field name="default_timezone">US/Pacific</field>
+    </record>
+    <record id="event_type_data_conference" model="event.type">
+        <field name="use_timezone" eval="True"/>
+        <field name="default_timezone">Europe/Brussels</field>
     </record>
 
     <!-- Event -->
@@ -29,7 +36,6 @@
         <field name="address_id" ref="base.res_partner_1"/>
         <field name="date_tz">US/Pacific</field>
         <field name="event_type_id" ref="event_type_0"/>
-        <field name="auto_confirm" eval="False"/>
         <field name="stage_id" ref="event_stage_booked"/>
     </record>
     <record id="event_0_ticket_0" model="event.event.ticket">
@@ -60,9 +66,8 @@
         <field name="user_id" ref="base.user_admin"/>
         <field eval="(DateTime.today()+ timedelta(days=100)).strftime('%Y-%m-%d 20:15:00')" name="date_begin"/>
         <field eval="(DateTime.today()+ timedelta(days=101)).strftime('%Y-%m-%d 00:30:00')" name="date_end"/>
-        <field name="event_type_id" ref="event_type_data_physical"/>
+        <field name="event_type_id" ref="event_type_2"/>
         <field name="address_id" ref="base.res_partner_1"/>
-        <field name="seats_availability">unlimited</field>
         <field name="stage_id" ref="event_stage_booked"/>
     </record>
 
@@ -97,7 +102,6 @@
         <field eval="(DateTime.today()+ timedelta(days=133)).strftime('%Y-%m-%d 00:30:00')" name="date_end"/>
         <field name="event_type_id" ref="event_type_0"/>
         <field name="address_id" ref="base.res_partner_3"/>
-        <field name="seats_availability">unlimited</field>
         <field name="stage_id" ref="event_stage_announced"/>
     </record>
 
@@ -112,7 +116,6 @@
         <field name="address_id" ref="base.res_partner_4"/>
         <field name="date_tz">US/Pacific</field>
         <field name="event_type_id" ref="event_type_1"/>
-        <field name="auto_confirm" eval="True"/>
         <field name="stage_id" ref="event_stage_announced"/>
     </record>
     <record id="event_4_ticket_0" model="event.event.ticket">
diff --git a/addons/website_event_questions/__manifest__.py b/addons/website_event_questions/__manifest__.py
index b4cddc33bc4..099abeef1a7 100644
--- a/addons/website_event_questions/__manifest__.py
+++ b/addons/website_event_questions/__manifest__.py
@@ -13,6 +13,7 @@
         'security/ir.model.access.csv',
     ],
     'demo': [
+        'data/event_question_demo.xml',
         'data/event_demo.xml',
         'data/event_registration_demo.xml',
     ],
diff --git a/addons/website_event_questions/data/event_demo.xml b/addons/website_event_questions/data/event_demo.xml
index 0a8b5e4f31b..cd199671613 100644
--- a/addons/website_event_questions/data/event_demo.xml
+++ b/addons/website_event_questions/data/event_demo.xml
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo><data>
-    <record id="event_0_question_0" model="event.question">
-        <field name="title">Meal Type</field>
-        <field name="once_per_order" eval="False"/>
-        <field name="event_id" ref="event.event_0"/>
-    </record>
-    <record id="event_0_question_0_answer_0" model="event.answer">
-        <field name="name">Mixed</field>
-        <field name="sequence">1</field>
-        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
-    </record>
-    <record id="event_0_question_0_answer_1" model="event.answer">
-        <field name="name">Vegetarian</field>
-        <field name="sequence">2</field>
-        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
-    </record>
-    <record id="event_0_question_0_answer_2" model="event.answer">
-        <field name="name">Pastafarian</field>
-        <field name="sequence">3</field>
-        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
+    <record id="event.event_type_data_conference" model="event.type">
+        <field name="use_timezone" eval="True"/>
+        <field name="default_timezone">Europe/Brussels</field>
+        <field name="use_questions" eval="True"/>
     </record>
 </data></odoo>
\ No newline at end of file
diff --git a/addons/website_event_questions/data/event_question_demo.xml b/addons/website_event_questions/data/event_question_demo.xml
new file mode 100644
index 00000000000..414ddb44735
--- /dev/null
+++ b/addons/website_event_questions/data/event_question_demo.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+    <!-- EVENT TYPE SPECIFIC -->
+    <record id="event_type_data_conference_question_0" model="event.question">
+        <field name="title">Participate to Social Event</field>
+        <field name="once_per_order" eval="False"/>
+        <field name="event_type_id" ref="event.event_type_data_conference"/>
+    </record>
+    <record id="event_type_data_conference_question_0_answer_0" model="event.answer">
+        <field name="name">Yes</field>
+        <field name="sequence">1</field>
+        <field name="question_id" ref="website_event_questions.event_type_data_conference_question_0"/>
+    </record>
+    <record id="event_type_data_conference_question_0_answer_1" model="event.answer">
+        <field name="name">No</field>
+        <field name="sequence">2</field>
+        <field name="question_id" ref="website_event_questions.event_type_data_conference_question_0"/>
+    </record>
+
+    <!-- EVENT SPECIFIC -->
+    <record id="event_0_question_0" model="event.question">
+        <field name="title">Meal Type</field>
+        <field name="once_per_order" eval="False"/>
+        <field name="event_id" ref="event.event_0"/>
+    </record>
+    <record id="event_0_question_0_answer_0" model="event.answer">
+        <field name="name">Mixed</field>
+        <field name="sequence">1</field>
+        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
+    </record>
+    <record id="event_0_question_0_answer_1" model="event.answer">
+        <field name="name">Vegetarian</field>
+        <field name="sequence">2</field>
+        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
+    </record>
+    <record id="event_0_question_0_answer_2" model="event.answer">
+        <field name="name">Pastafarian</field>
+        <field name="sequence">3</field>
+        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
+    </record>
+</data></odoo>
diff --git a/addons/website_event_track/data/event_data.xml b/addons/website_event_track/data/event_data.xml
index 772b0673ed2..2f32534c80a 100644
--- a/addons/website_event_track/data/event_data.xml
+++ b/addons/website_event_track/data/event_data.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <record id="event_type_data_tracks" model="event.type">
-            <field name="name">Conference</field>
-            <field name="auto_confirm" eval="True"/>
-            <field name="use_mail_schedule" eval="True"/>
+        <record id="event.event_type_data_conference" model="event.type">
             <field name="website_menu" eval="True"/>
             <field name="website_track" eval="True"/>
             <field name="website_track_proposal" eval="True"/>