diff --git a/addons/theme_default/__manifest__.py b/addons/theme_default/__manifest__.py
index 27f523834a77ad90660486fd9add1b598ff7e19a..cc2c6ad38f202d761da6779f8cf10c667ece2672 100644
--- a/addons/theme_default/__manifest__.py
+++ b/addons/theme_default/__manifest__.py
@@ -8,7 +8,7 @@
     'sequence': 1000,
     'version': '1.0',
     'depends': ['website'],
-    'demo': [
+    'data': [
         'data/theme_default_data.xml',
     ],
     'images': [
diff --git a/addons/website/models/res_config_settings.py b/addons/website/models/res_config_settings.py
index 4d05f8436b9d24cc2b1a016c912f846d5eceae58..a502bb2fe7d554102867882da4107606bc62111c 100644
--- a/addons/website/models/res_config_settings.py
+++ b/addons/website/models/res_config_settings.py
@@ -152,7 +152,7 @@ class ResConfigSettings(models.TransientModel):
     def action_website_create_new(self):
         return {
             'view_mode': 'form',
-            'view_id': self.env.ref('website.view_website_form').id,
+            'view_id': self.env.ref('website.view_website_form_view_themes_modal').id,
             'res_model': 'website',
             'type': 'ir.actions.act_window',
             'target': 'new',
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 51fefb5bfb4eb955c3fdfb9b957f6c660b7f3c4d..11b8171dcccc8209ca9ca264b776336986d14e33 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -43,11 +43,21 @@
                             </group>
                         </div>
                     </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="view_website_form_view_themes_modal" model="ir.ui.view">
+            <field name="name">website.modal.form</field>
+            <field name="model">website</field>
+            <field name="inherit_id" ref="website.view_website_form"/>
+            <field name="mode">primary</field>
+            <field name="arch" type="xml">
+                <xpath expr="//form" position="inside">
                     <footer>
-                        <button name="create_and_redirect_to_theme" type="object" string="Choose a theme" class="ml-2 btn btn-primary" icon="fa-paint-brush"/>
-                        <button string="Cancel" class="btn btn-default" special="cancel"/>
+                        <button name="create_and_redirect_to_theme" type="object" string="Choose a theme" class="btn btn-primary" icon="fa-paint-brush"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel"/>
                     </footer>
-                </form>
+                </xpath>
             </field>
         </record>