diff --git a/test_themes/__manifest__.py b/test_themes/__manifest__.py
index dd855d815..6fa2e8998 100644
--- a/test_themes/__manifest__.py
+++ b/test_themes/__manifest__.py
@@ -40,10 +40,14 @@
         'theme_zap',
     ],
     'data': [
-        'views/assets.xml',
         'views/website_navbar_templates.xml',
     ],
     'installable': True,
     'application': False,
     'post_init_hook': 'post_init_hook',
+    'assets': {
+        'web.assets_frontend': [
+            'test_themes/static/src/js/navbar.js',
+        ],
+    }
 }
diff --git a/test_themes/tests/test_crawl.py b/test_themes/tests/test_crawl.py
index 6d0c1591d..306157ef1 100644
--- a/test_themes/tests/test_crawl.py
+++ b/test_themes/tests/test_crawl.py
@@ -13,12 +13,23 @@ class Crawler(HttpCase):
         Website = self.env['website']
         websites_themes = Website.get_test_themes_websites()
         assert len(websites_themes) == len(self.env.ref('base.module_test_themes').dependencies_id)
+        websites_themes_names = websites_themes.mapped('name')
 
         def test_crawling():
             for website in websites_themes.filtered(lambda w: w.theme_id.name != 'theme_default'):
+                # Ensure theme is rendering without crashing
                 r = self.url_open('/?fw=%s&debug=assets' % website.id)
-                self.assertEqual(r.status_code, 200, "Ensure rendering went fine as public user")
-                self.assertTrue('/%s/static/src' % website.theme_id.name in r.text, "Ensure rendering went fine as public user")
+                self.assertEqual(r.status_code, 200, "Ensure theme is rendering without crashing")
+
+                # Ensure correct theme is actually loaded, see commit message
+                theme_asset_url = '/web/assets/debug/%s/web.assets_frontend.css' % website.id
+                self.assertTrue(theme_asset_url in r.text)
+                r = self.url_open(theme_asset_url)
+                self.assertTrue('/%s/static/src' % website.theme_id.name in r.text, "Ensure theme is actually loaded")
+                # Ensure other website/themes are not loaded
+                for name in websites_themes_names:
+                    if name != website.theme_id.name:
+                        self.assertFalse('/%s/static/src' % name in r.text, "Ensure other themes do not pollute current one")
 
         # 1. Test as public user
         test_crawling()
diff --git a/test_themes/views/assets.xml b/test_themes/views/assets.xml
deleted file mode 100644
index 276717395..000000000
--- a/test_themes/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="Website Assets">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/test_themes/static/src/js/navbar.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_anelusia/__manifest__.py b/theme_anelusia/__manifest__.py
index a1a284898..c86d79ee7 100644
--- a/theme_anelusia/__manifest__.py
+++ b/theme_anelusia/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_content.xml',
         'views/images_library.xml',
 
@@ -17,14 +17,16 @@
         'views/snippets/s_images_wall.xml',
         'views/snippets/s_media_list.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-        'views/old_snippets/s_features_carousel.xml',
-        'views/old_snippets/s_products_carousel.xml',
-    ],
+        ],
     'images': [
         'static/description/anelusia_description.png',
         'static/description/anelusia_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-anelusia.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_anelusia/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_anelusia/data/ir_asset.xml b/theme_anelusia/data/ir_asset.xml
new file mode 100644
index 000000000..4c3e376c2
--- /dev/null
+++ b/theme_anelusia/data/ir_asset.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_anelusia.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_anelusia.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_anelusia/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_anelusia.s_banner_parallax_000_scss" model="theme.ir.asset">
+            <field name="key">theme_anelusia.s_banner_parallax_000_scss</field>
+            <field name="name">Banner parallax 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_anelusia/static/src/old_snippets/s_banner_parallax/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_anelusia.s_features_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_anelusia.s_features_carousel_000_variables_scss</field>
+            <field name="name">Features carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_anelusia/static/src/old_snippets/s_features_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_anelusia.s_products_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_anelusia.s_products_carousel_000_variables_scss</field>
+            <field name="name">Products carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_anelusia/static/src/old_snippets/s_products_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_anelusia.s_products_carousel_000_scss" model="theme.ir.asset">
+            <field name="key">theme_anelusia.s_products_carousel_000_scss</field>
+            <field name="name">Products carousel 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_anelusia/static/src/old_snippets/s_products_carousel/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_anelusia.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_anelusia.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_anelusia/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_anelusia.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_anelusia.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_anelusia/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+        <record id="theme_anelusia.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_anelusia.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_anelusia/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_anelusia/models/theme_anelusia.py b/theme_anelusia/models/theme_anelusia.py
index 5f54fedb7..b93298d34 100644
--- a/theme_anelusia/models/theme_anelusia.py
+++ b/theme_anelusia/models/theme_anelusia.py
@@ -15,4 +15,4 @@ class ThemeAnelusia(models.AbstractModel):
         self.enable_view('website.template_footer_headline')
 
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-1')
+        # self.enable_asset('theme_common.compatibility_saas_10_1')
diff --git a/theme_anelusia/static/src/scss/primary_variables.scss b/theme_anelusia/static/src/scss/primary_variables.scss
index a1bbee55f..a71948388 100644
--- a/theme_anelusia/static/src/scss/primary_variables.scss
+++ b/theme_anelusia/static/src/scss/primary_variables.scss
@@ -4,6 +4,8 @@
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'anelusia-1',
+
         // Header
         'header-font-size':                 (20 / 16) * 1rem,
         'header-template':                  'hamburger-full',
@@ -60,123 +62,78 @@ $o-theme-font-configs: (
 // Colors
 //------------------------------------------------------------------------------
 
-$o-color-palettes: (
-    ( // Palette 1
-        'o-color-1':                        #000000,
-        'o-color-2':                        #e4e4e4,
-        'o-color-3':                        #00459e,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #444444,
-
-        'o-cc2-headings':                   'o-color-4',
-        'o-cc2-link':                       'o-color-4',
-        'o-cc2-btn-primary':                'o-color-4',
-
-        'o-cc4-headings':                   'o-color-4',
-        'o-cc4-btn-primary':                'o-color-4',
-        'o-cc4-text':                       'o-color-2',
-        'o-cc4-link':                       'o-color-4',
-
-        'o-cc5-text':                       'o-color-2',
-        'o-cc5-link':                       'o-color-4',
-
-        'menu':                             4,
-        'footer':                           4,
-        'copyright':                        4,
-    ),
-    ( // Palette 2
-        'o-color-1':                        #d4ab0a,
-        'o-color-2':                        #444444,
-        'o-color-3':                        #ececec,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #000000,
-
-        'menu':                             4,
-        'footer':                           1,
-        'copyright':                        2,
-    ),
-    ( // Palette 3
-        'o-color-1':                        #005699,
-        'o-color-2':                        #ac5e82,
-        'o-color-3':                        #d8eff1,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #222222,
-
-        'o-cc5-link':                       #218bdf,
-        'o-cc5-btn-primary':                #218bdf,
-    ),
-    ( // Palette 4
-        'o-color-1':                        #dc143c,
-        'o-color-2':                        #7e2839,
-        'o-color-3':                        #faf7e1,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #222222,
-    ),
-    ( // Palette 5
-        'o-color-1':                        #32c0c9,
-        'o-color-2':                        #cfcfcf,
-        'o-color-3':                        #cee6e7,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #2e2e2e,
-
-        'footer':                           1,
-    ),
-    ( // Palette 6
-        'o-color-1':                        #e27b92,
-        'o-color-2':                        #e4e4e4,
-        'o-color-3':                        #465548,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #222222,
-
-        'o-cc2-headings':                   'o-color-4',
-        'o-cc5-text':                       'o-color-2',
-
-        'menu':                             2,
-        'footer':                           2,
-    ),
-);
 // Compatibility
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha':                            #ffffff,
-        'beta':                             #cdd0a2,
-        'gamma':                            #b4bbb9,
-        'delta':                            #242327,
-        'epsilon':                          #957985,
-    ),
-    (
-        'alpha':                            #ffffff,
-        'beta':                             #f4f1db,
-        'gamma':                            #928371,
-        'delta':                            #53453f,
-        'epsilon':                          #c31737,
-    ),
-    (
-        'alpha':                            #ffffff,
-        'beta':                             #d8eff1,
-        'gamma':                            #0d75ac,
-        'delta':                            #000f3d,
-        'epsilon':                          #e07a6b,
-    ),
-    (
-        'alpha':                            #ffffff,
-        'beta':                             #faf7e1,
-        'gamma':                            #e3d6c6,
-        'delta':                            #eed187,
-        'epsilon':                          #dc733f,
-    ),
-    (
-        'alpha':                            #ffffff,
-        'beta':                             #cfcfcf,
-        'gamma':                            #2e2e2e,
-        'delta':                            #000000,
-        'epsilon':                          #32c0c9,
-    ),
-    (
-        'alpha':                            #ffffff,
-        'beta':                             #aacfb0,
-        'gamma':                            #4dac5e,
-        'delta':                            #93ab12,
-        'epsilon':                          #e62e3e,
-    ),
+        'anelusia-1': (
+            'alpha':                            #ffffff,
+            'beta':                             #cdd0a2,
+            'gamma':                            #b4bbb9,
+            'delta':                            #242327,
+            'epsilon':                          #957985,
+        ),
+        'anelusia-2': (
+            'alpha':                            #ffffff,
+            'beta':                             #f4f1db,
+            'gamma':                            #928371,
+            'delta':                            #53453f,
+            'epsilon':                          #c31737,
+        ),
+        'anelusia-3': (
+            'alpha':                            #ffffff,
+            'beta':                             #d8eff1,
+            'gamma':                            #0d75ac,
+            'delta':                            #000f3d,
+            'epsilon':                          #e07a6b,
+        ),
+        'anelusia-4': (
+            'alpha':                            #ffffff,
+            'beta':                             #faf7e1,
+            'gamma':                            #e3d6c6,
+            'delta':                            #eed187,
+            'epsilon':                          #dc733f,
+        ),
+        'anelusia-5': (
+            'alpha':                            #ffffff,
+            'beta':                             #cfcfcf,
+            'gamma':                            #2e2e2e,
+            'delta':                            #000000,
+            'epsilon':                          #32c0c9,
+        ),
+        'anelusia-6': (
+            'alpha':                            #ffffff,
+            'beta':                             #aacfb0,
+            'gamma':                            #4dac5e,
+            'delta':                            #93ab12,
+            'epsilon':                          #e62e3e,
+        ),
+    )
+);
+
+$o-palette-priority-prefix: 'anelusia';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'anelusia-1',
+    2: 'anelusia-2',
+    3: 'anelusia-3',
+    4: 'anelusia-4',
+    5: 'anelusia-5',
+    6: 'anelusia-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
 );
diff --git a/theme_anelusia/views/assets.xml b/theme_anelusia/views/assets.xml
deleted file mode 100644
index f97ea30fa..000000000
--- a/theme_anelusia/views/assets.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_anelusia/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_anelusia/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_anelusia/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_anelusia/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_anelusia/views/old_snippets/s_banner_parallax.xml b/theme_anelusia/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index 0574b0d64..000000000
--- a/theme_anelusia/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_anelusia/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_banner_parallax_css_000" inherit_id="theme_common.assets_snippet_s_banner_parallax_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_anelusia/static/src/old_snippets/s_banner_parallax/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_anelusia/views/old_snippets/s_features_carousel.xml b/theme_anelusia/views/old_snippets/s_features_carousel.xml
deleted file mode 100644
index 647927aff..000000000
--- a/theme_anelusia/views/old_snippets/s_features_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_features_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_features_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_anelusia/static/src/old_snippets/s_features_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_anelusia/views/old_snippets/s_products_carousel.xml b/theme_anelusia/views/old_snippets/s_products_carousel.xml
deleted file mode 100644
index 8efbb5763..000000000
--- a/theme_anelusia/views/old_snippets/s_products_carousel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_products_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_products_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_anelusia/static/src/old_snippets/s_products_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_products_carousel_css_000" inherit_id="theme_common.assets_snippet_s_products_carousel_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_anelusia/static/src/old_snippets/s_products_carousel/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_artists/__manifest__.py b/theme_artists/__manifest__.py
index 77ccb3af5..b6318d361 100644
--- a/theme_artists/__manifest__.py
+++ b/theme_artists/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
 
         'views/snippets/s_parallax.xml',
@@ -16,13 +16,16 @@
         'views/snippets/s_three_columns.xml',
         'views/snippets/s_call_to_action.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-        'views/old_snippets/s_products_carousel.xml',
-    ],
+        ],
     'images': [
         'static/description/artists_description.png',
         'static/description/artists_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-artists.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_artists/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_artists/data/ir_asset.xml b/theme_artists/data/ir_asset.xml
new file mode 100644
index 000000000..19c10a9ba
--- /dev/null
+++ b/theme_artists/data/ir_asset.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_artists.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_artists.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_artists/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_artists.s_products_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_artists.s_products_carousel_000_variables_scss</field>
+            <field name="name">Products carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_artists/static/src/old_snippets/s_products_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_artists.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_artists.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_artists/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_artists.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_artists.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_artists/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_artists/models/theme_artists.py b/theme_artists/models/theme_artists.py
index b2fab531e..2c8eb1af4 100644
--- a/theme_artists/models/theme_artists.py
+++ b/theme_artists/models/theme_artists.py
@@ -6,7 +6,7 @@ class ThemeArtists(models.AbstractModel):
 
     def _theme_artists_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-2')
+        # self.enable_asset('theme_common.compatibility_saas_10_2')
 
         self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_hamburger')
@@ -15,4 +15,5 @@ class ThemeArtists(models.AbstractModel):
         self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_centered')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
diff --git a/theme_artists/static/src/scss/primary_variables.scss b/theme_artists/static/src/scss/primary_variables.scss
index 9d0622f53..e9aa68e29 100644
--- a/theme_artists/static/src/scss/primary_variables.scss
+++ b/theme_artists/static/src/scss/primary_variables.scss
@@ -1,71 +1,3 @@
-//------------------------------------------------------------------------------
-// Palette
-//------------------------------------------------------------------------------
-
-$o-color-palettes: (
-    (
-        'o-color-1': #ab44ff,
-        'o-color-2': #3a3a3a,
-        'o-color-3': #e5e5e5,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'o-cc5-text': 'o-color-3',
-
-        'menu': 5,
-    ),
-    (
-        'o-color-1': #1ad68f,
-        'o-color-2': #2e2e2e,
-        'o-color-3': #cfcfcf,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'menu': 2,
-    ),
-    (
-        'o-color-1': #007882,
-        'o-color-2': #052286,
-        'o-color-3': #f9ede6,
-        'o-color-4': #ffffff,
-        'o-color-5': #33302e,
-
-        'o-cc5-link': #48d9e5,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #0061df,
-        'o-color-2': #1b1b1b,
-        'o-color-3': #e8e6dc,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'menu': 2,
-        'footer': 2,
-    ),
-    (
-        'o-color-1': #f48847,
-        'o-color-2': #282d30,
-        'o-color-3': #e9ceb0,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'footer': 3,
-    ),
-    (
-        'o-color-1': #95d2e5,
-        'o-color-2': #454545,
-        'o-color-3': #f6f4f2,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'menu': 2,
-        'footer': 2,
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -146,6 +78,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'artists-1',
         'header-font-size': (13 / 16) * 1rem,
         'font': 'Droid Sans',
         'headings-font': 'Radley',
@@ -158,3 +91,31 @@ $o-website-values-palettes: (
         'footer-template': 'centered',
     ),
 );
+
+$o-palette-priority-prefix: 'artists';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'artists-1',
+    2: 'artists-2',
+    3: 'artists-3',
+    4: 'artists-4',
+    5: 'artists-5',
+    6: 'artists-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
+);
diff --git a/theme_artists/views/assets.xml b/theme_artists/views/assets.xml
deleted file mode 100644
index 122421cf8..000000000
--- a/theme_artists/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_artists/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_artists/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_artists/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_artists/views/old_snippets/s_banner_parallax.xml b/theme_artists/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index 98e268dd6..000000000
--- a/theme_artists/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_artists/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_artists/views/old_snippets/s_products_carousel.xml b/theme_artists/views/old_snippets/s_products_carousel.xml
deleted file mode 100644
index 07913fc09..000000000
--- a/theme_artists/views/old_snippets/s_products_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_products_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_products_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_artists/static/src/old_snippets/s_products_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_avantgarde/__manifest__.py b/theme_avantgarde/__manifest__.py
index 4f2509bed..aab08e07d 100644
--- a/theme_avantgarde/__manifest__.py
+++ b/theme_avantgarde/__manifest__.py
@@ -7,13 +7,11 @@
     'version': '2.0.0',
     'author': 'Odoo S.A.',
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_library.xml',
         'views/customizations.xml',
 
-        'views/old_snippets/s_css_slider.xml',
-        'views/old_snippets/s_showcase_slider.xml',
-    ],
+        ],
     'images': [
         'static/description/poster.jpg',
         'static/description/avantgarde_screenshot.jpg',
@@ -21,4 +19,9 @@
     'depends': ['theme_common'],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-avantgarde.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_avantgarde/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_avantgarde/data/ir_asset.xml b/theme_avantgarde/data/ir_asset.xml
new file mode 100644
index 000000000..f2f5a7adf
--- /dev/null
+++ b/theme_avantgarde/data/ir_asset.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_avantgarde.s_showcase_slider_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_avantgarde.s_showcase_slider_000_variables_scss</field>
+            <field name="name">Showcase slider 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_avantgarde/static/src/old_snippets/s_showcase_slider/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_avantgarde.s_css_slider_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_avantgarde.s_css_slider_000_variables_scss</field>
+            <field name="name">Css slider 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_avantgarde/static/src/old_snippets/s_css_slider/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_avantgarde.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_avantgarde.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_avantgarde/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_avantgarde.secondary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_avantgarde.secondary_variables_scss</field>
+            <field name="name">Secondary variables SCSS</field>
+            <field name="bundle">web._assets_secondary_variables</field>
+            <field name="glob">theme_avantgarde/static/src/scss/secondary_variables.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_avantgarde/models/theme_avantgarde.py b/theme_avantgarde/models/theme_avantgarde.py
index de73843d7..12c857f12 100644
--- a/theme_avantgarde/models/theme_avantgarde.py
+++ b/theme_avantgarde/models/theme_avantgarde.py
@@ -6,7 +6,7 @@ class ThemeAvantgarde(models.AbstractModel):
 
     def _theme_avantgarde_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-2')
+        # self.enable_asset('theme_common.compatibility_saas_10_2')
 
         self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_magazine')
@@ -15,4 +15,5 @@ class ThemeAvantgarde(models.AbstractModel):
         self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_centered')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
diff --git a/theme_avantgarde/static/src/scss/primary_variables.scss b/theme_avantgarde/static/src/scss/primary_variables.scss
index 304e70d2a..c78e6d8a8 100644
--- a/theme_avantgarde/static/src/scss/primary_variables.scss
+++ b/theme_avantgarde/static/src/scss/primary_variables.scss
@@ -4,217 +4,86 @@
 //------------------------------------------------------------------------------
 
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #E91E63,
-        'beta': #FF9833,
-        'gamma': #339ACC,
-        'delta': #00CC64,
-        'epsilon': #572F59,
+        'avantgarde-1': (
+            'alpha': #E91E63,
+            'beta': #FF9833,
+            'gamma': #339ACC,
+            'delta': #00CC64,
+            'epsilon': #572F59,
 
-        'success': #5CB85C,
-        'info': #4D68A3,
-        'warning': #DDC66B,
-        'danger': #D86060,
-    ),
-    (
-        'alpha': #DBAD10,
-        'beta': #595959,
-        'gamma': #808F85,
-        'delta': #91C499,
-        'epsilon': #F2E9DC,
-    ),
-    (
-        'alpha': #3BBFEE,
-        'beta': #58355E,
-        'gamma': #E03616,
-        'delta': #FFF689,
-        'epsilon': #CFFFB0,
+            'success': #5CB85C,
+            'info': #4D68A3,
+            'warning': #DDC66B,
+            'danger': #D86060,
+        ),
+        'avantgarde-2':(
+            'alpha': #DBAD10,
+            'beta': #595959,
+            'gamma': #808F85,
+            'delta': #91C499,
+            'epsilon': #F2E9DC,
+        ),
+        'avantgarde-3':(
+            'alpha': #3BBFEE,
+            'beta': #58355E,
+            'gamma': #E03616,
+            'delta': #FFF689,
+            'epsilon': #CFFFB0,
 
-        'success': #31B05E,
-        'info': #4D68A3,
-        'warning': #EACF41,
-        'danger': #CB3E3E,
-    ),
-    (
-        'alpha': #009688,
-        'beta': #003249,
-        'gamma': #313715,
-        'delta': #ECCE8E,
-        'epsilon': #D16014,
+            'success': #31B05E,
+            'info': #4D68A3,
+            'warning': #EACF41,
+            'danger': #CB3E3E,
+        ),
+        'avantgarde-4':(
+            'alpha': #009688,
+            'beta': #003249,
+            'gamma': #313715,
+            'delta': #ECCE8E,
+            'epsilon': #D16014,
 
-        'success': #5CB85C,
-    ),
-    (
-        'alpha': #F44336,
-        'beta': #450D0B,
-        'gamma': #1F143B,
-        'delta': #80A2BD,
-        'epsilon': #655557,
+            'success': #5CB85C,
+        ),
+        'avantgarde-5':(
+            'alpha': #F44336,
+            'beta': #450D0B,
+            'gamma': #1F143B,
+            'delta': #80A2BD,
+            'epsilon': #655557,
 
-        'success': #31B05E,
-        'info': #4D68A3,
-        'warning': #EACF41,
-        'danger': #CB3E3E,
-    ),
-    (
-        'alpha': #CDDC39,
-        'beta': #D6F8D6,
-        'gamma': #7FC6A4,
-        'delta': #5D737E,
-        'epsilon': #55505C,
-    ),
-    (
-        'alpha': #FF5722,
-        'beta': #29335C,
-        'gamma': #F3A712,
-        'delta': #F0CEA0,
-        'epsilon': #534D41,
-    ),
-    (
-        'alpha': #607D8B,
-        'beta': #3B1F2B,
-        'gamma': #A9ACA9,
-        'delta': #969397,
-        'epsilon': #60495A,
+            'success': #31B05E,
+            'info': #4D68A3,
+            'warning': #EACF41,
+            'danger': #CB3E3E,
+        ),
+        'avantgarde-6':(
+            'alpha': #CDDC39,
+            'beta': #D6F8D6,
+            'gamma': #7FC6A4,
+            'delta': #5D737E,
+            'epsilon': #55505C,
+        ),
+        'avantgarde-7':(
+            'alpha': #FF5722,
+            'beta': #29335C,
+            'gamma': #F3A712,
+            'delta': #F0CEA0,
+            'epsilon': #534D41,
+        ),
+        'avantgarde-8':(
+            'alpha': #607D8B,
+            'beta': #3B1F2B,
+            'gamma': #A9ACA9,
+            'delta': #969397,
+            'epsilon': #60495A,
 
-        'success': #5CB85C,
-    ),
+            'success': #5CB85C,
+        ),
+    )
 );
 
-// Theme Palettes
-$o-color-palettes: (
-    (
-        'o-color-1': #ee4980,
-        'o-color-2': #5f5458,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'o-cc5-headings': 'o-color-1',
-
-        'body': 'o-color-3',
-        'footer': 1,
-        'copyright': 3,
-    ),
-    (
-        'o-color-1': #38383b,
-        'o-color-2': #918f8b,
-        'o-color-3': #dfe0e1,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'o-cc4-headings': 'o-color-3',
-        'o-cc5-headings': 'o-color-2',
-
-        'o-cc4-btn-primary': 'o-color-3',
-        'o-cc5-btn-primary': 'o-color-2',
-
-        'menu': 4,
-        'footer': 4,
-    ),
-    (
-        'o-color-1': #f08e80,
-        'o-color-2': #0b0d63,
-        'o-color-3': #fdf0e6,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #4e4d4d,
-
-        'o-cc2-headings': 'o-color-2',
-        'o-cc3-headings': 'o-color-3',
-        'o-cc4-headings': 'o-color-5',
-        'o-cc5-headings': 'o-color-1',
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #f78f4a,
-        'o-color-2': #94583a,
-        'o-color-3': #F7EFBA,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #312b24,
-
-        'o-cc2-headings': 'o-color-2',
-        'o-cc3-headings': 'o-color-3',
-        'o-cc4-headings': 'o-color-5',
-        'o-cc5-headings': 'o-color-1',
-
-        'o-cc2-btn-primary': 'o-color-2',
-        'o-cc3-btn-primary': 'o-color-3',
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #AC578C,
-        'o-color-2': #69355D,
-        'o-color-3': #F7EFBA,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'o-cc2-headings': 'o-color-2',
-        'o-cc3-headings': 'o-color-3',
-        'o-cc4-headings': 'o-color-5',
-        'o-cc5-headings': 'o-color-1',
-
-        'o-cc2-btn-primary': 'o-color-2',
-        'o-cc3-btn-primary': 'o-color-3',
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #f3b65b,
-        'o-color-2': #3c4e3c,
-        'o-color-3': #e7d1b5,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'o-cc2-headings': 'o-color-2',
-        'o-cc3-headings': 'o-color-3',
-        'o-cc5-headings': 'o-color-1',
-    ),
-    (
-        'o-color-1': #f48847,
-        'o-color-2': #282d30,
-        'o-color-3': #e9ceb0,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'o-cc2-headings': 'o-color-1',
-        'o-cc5-headings': 'o-color-1',
-    ),
-    (
-        'o-color-1': #278f84,
-        'o-color-2': #494048,
-        'o-color-3': #ebe1ea,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #201c20,
-
-        'o-cc2-headings': 'o-color-1',
-        'o-cc5-headings': 'o-color-1',
-    ),
-);
-
-// Grays
-$-black: #000000;
-$o-gray-color-palettes: ();
-@each $-palette in $o-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '975': lighten($-black, 13%),
-        '950': lighten($-black, 16%),
-        '925': lighten($-black, 19%),
-        '900': lighten($-black, 22%),
-        '800': lighten($-black, 25%),
-        '700': lighten($-black, 33.5%),
-        '650': lighten($-black, 50%),
-        '600': lighten($-black, 65.5%),
-        '400': lighten($-black, 82%),
-        '200': lighten($-black, 93.5%),
-    ));
-}
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -295,6 +164,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'avantgarde-1',
+
         'font-size-base': (14 / 16) * 1rem,
         'font': 'Heebo',
         'headings-font': 'Playfair Display',
@@ -314,3 +185,33 @@ $o-website-values-palettes: (
         'link-underline': 'always',
     ),
 );
+
+$o-palette-priority-prefix: 'avantgarde';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'avantgarde-1',
+    2: 'avantgarde-2',
+    3: 'avantgarde-3',
+    4: 'avantgarde-4',
+    5: 'avantgarde-5',
+    6: 'avantgarde-6',
+    7: 'avantgarde-7',
+    8: 'avantgarde-8',
+    9: 'generic-1',
+    10: 'generic-2',
+    11: 'generic-3',
+    12: 'generic-4',
+    13: 'generic-5',
+    14: 'generic-6',
+    15: 'generic-7',
+    16: 'generic-8',
+    17: 'generic-9',
+    18: 'generic-10',
+    19: 'generic-11',
+    20: 'generic-12',
+    21: 'generic-13',
+    22: 'generic-14',
+    23: 'generic-15',
+    24: 'generic-16',
+    25: 'generic-17',
+);
diff --git a/theme_avantgarde/views/assets.xml b/theme_avantgarde/views/assets.xml
deleted file mode 100644
index cb058e42b..000000000
--- a/theme_avantgarde/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_avantgarde/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_secondary_variables" inherit_id="website._assets_secondary_variables" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_avantgarde/static/src/scss/secondary_variables.scss"/>
-        </xpath>
-    </template>
-
-    <!-- Onboarding Tour -->
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_avantgarde/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_avantgarde/views/old_snippets/s_css_slider.xml b/theme_avantgarde/views/old_snippets/s_css_slider.xml
deleted file mode 100644
index 0c3625234..000000000
--- a/theme_avantgarde/views/old_snippets/s_css_slider.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_css_slider_css_000_variables" inherit_id="theme_common._assets_snippet_s_css_slider_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_avantgarde/static/src/old_snippets/s_css_slider/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_avantgarde/views/old_snippets/s_showcase_slider.xml b/theme_avantgarde/views/old_snippets/s_showcase_slider.xml
deleted file mode 100644
index 3d9d0e0cc..000000000
--- a/theme_avantgarde/views/old_snippets/s_showcase_slider.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_showcase_slider_css_000_variables" inherit_id="theme_common._assets_snippet_s_showcase_slider_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_avantgarde/static/src/old_snippets/s_showcase_slider/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_beauty/__manifest__.py b/theme_beauty/__manifest__.py
index 69a17a470..942220da5 100644
--- a/theme_beauty/__manifest__.py
+++ b/theme_beauty/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
 
         'views/snippets/s_cover.xml',
@@ -17,12 +17,16 @@
         'views/snippets/s_company_team.xml',
         'views/snippets/s_call_to_action.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-    ],
+        ],
     'images': [
         'static/description/beauty_description.png',
         'static/description/beauty_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-beauty.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_beauty/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_beauty/data/ir_asset.xml b/theme_beauty/data/ir_asset.xml
new file mode 100644
index 000000000..def2d14f5
--- /dev/null
+++ b/theme_beauty/data/ir_asset.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_beauty.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_beauty.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_beauty/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_beauty.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_beauty.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_beauty/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_beauty.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_beauty.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_beauty/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+        <record id="theme_beauty.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_beauty.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_beauty/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_beauty/static/src/scss/primary_variables.scss b/theme_beauty/static/src/scss/primary_variables.scss
index 41d348557..3ee4d4c89 100644
--- a/theme_beauty/static/src/scss/primary_variables.scss
+++ b/theme_beauty/static/src/scss/primary_variables.scss
@@ -1,74 +1,3 @@
-$o-color-palettes: (
-    (
-        'o-color-1': #df699c,
-        'o-color-2': #590046,
-        'o-color-3': #dbe8ed,
-        'o-color-4': #ffffff,
-        'o-color-5': #222222,
-
-        'o-cc2-text': 'o-color-1',
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #4fda89,
-        'o-color-2': #714e9c,
-        'o-color-3': #dadbdb,
-        'o-color-4': #ffffff,
-        'o-color-5': #242327,
-
-        'o-cc2-link': 'o-color-5',
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #009083,
-        'o-color-2': #8ba1a0,
-        'o-color-3': #e9e9e9,
-        'o-color-4': #ffffff,
-        'o-color-5': #1e222f,
-
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #b6977d,
-        'o-color-2': #585832,
-        'o-color-3': #e7e5e5,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #1ad68f,
-        'o-color-2': #2e2e2e,
-        'o-color-3': #e9e9e9,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'o-cc2-link': 'o-color-5',
-
-        'menu': 3,
-        'footer': 3,
-        'copyright': 3,
-    ),
-    (
-        'o-color-1': #b3b862,
-        'o-color-2': #1e493b,
-        'o-color-3': #e3e7e9,
-        'o-color-4': #ffffff,
-        'o-color-5': #112625,
-
-        'o-cc2-link': 'o-color-5',
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -125,6 +54,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'beauty-1',
+
         'header-font-size': (18 / 16) * 1rem,
         'btn-border-radius': .3125rem,
         'btn-border-radius-lg': .3125rem,
@@ -138,3 +69,31 @@ $o-website-values-palettes: (
         'header-links-style': 'outline',
     ),
 );
+
+$o-palette-priority-prefix: 'beauty';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'beauty-1',
+    2: 'beauty-2',
+    3: 'beauty-3',
+    4: 'beauty-4',
+    5: 'beauty-5',
+    6: 'beauty-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
+);
diff --git a/theme_beauty/views/assets.xml b/theme_beauty/views/assets.xml
deleted file mode 100644
index f2aa4081b..000000000
--- a/theme_beauty/views/assets.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_beauty/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_beauty/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_beauty/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_beauty/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_beauty/views/old_snippets/s_banner_parallax.xml b/theme_beauty/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index 8e3209927..000000000
--- a/theme_beauty/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_beauty/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_bewise/__manifest__.py b/theme_bewise/__manifest__.py
index f10003ce8..af9ae37da 100644
--- a/theme_bewise/__manifest__.py
+++ b/theme_bewise/__manifest__.py
@@ -8,19 +8,20 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/image_content.xml',
         'views/customizations.xml',
 
-        'views/old_snippets/s_big_icons.xml',
-        'views/old_snippets/s_big_image_parallax.xml',
-        'views/old_snippets/s_big_image.xml',
-        'views/old_snippets/s_icon_box.xml',
-    ],
+        ],
     'images': [
         'static/description/bewise_description.jpg',
         'static/description/bewise_screenshot.jpeg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-bewise.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_bewise/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_bewise/data/ir_asset.xml b/theme_bewise/data/ir_asset.xml
new file mode 100644
index 000000000..fb36744ca
--- /dev/null
+++ b/theme_bewise/data/ir_asset.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_bewise.s_big_image_parallax_000_scss" model="theme.ir.asset">
+            <field name="key">theme_bewise.s_big_image_parallax_000_scss</field>
+            <field name="name">Big image parallax 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_bewise/static/src/old_snippets/s_big_image_parallax/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_bewise.s_big_image_000_scss" model="theme.ir.asset">
+            <field name="key">theme_bewise.s_big_image_000_scss</field>
+            <field name="name">Big image 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_bewise/static/src/old_snippets/s_big_image/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_bewise.s_icon_box_000_scss" model="theme.ir.asset">
+            <field name="key">theme_bewise.s_icon_box_000_scss</field>
+            <field name="name">Icon box 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_bewise/static/src/old_snippets/s_icon_box/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_bewise.s_big_icons_000_scss" model="theme.ir.asset">
+            <field name="key">theme_bewise.s_big_icons_000_scss</field>
+            <field name="name">Big icons 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_bewise/static/src/old_snippets/s_big_icons/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_bewise.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_bewise.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_bewise/static/src/scss/primary_variables.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_bewise/models/theme_bewise.py b/theme_bewise/models/theme_bewise.py
index 22794953f..2d21474aa 100644
--- a/theme_bewise/models/theme_bewise.py
+++ b/theme_bewise/models/theme_bewise.py
@@ -6,9 +6,10 @@ class ThemeBewise(models.AbstractModel):
 
     def _theme_bewise_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-2')
+        # self.enable_asset('theme_common.compatibility_saas_10_2')
 
         self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_headline')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
diff --git a/theme_bewise/static/src/scss/primary_variables.scss b/theme_bewise/static/src/scss/primary_variables.scss
index 56fb34b0b..816f7ba54 100644
--- a/theme_bewise/static/src/scss/primary_variables.scss
+++ b/theme_bewise/static/src/scss/primary_variables.scss
@@ -4,84 +4,37 @@
 //------------------------------------------------------------------------------
 
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        alpha: #11b6a8,
-        beta: #B9EAE8,
-        gamma: #fda301,
-        delta: #febf00,
-        epsilon: #1b7f7e,
-    ),
-    (
-        alpha: #45AADA,
-        beta: #B3DCF0,
-        gamma: #f74b94,
-        delta: #FDC6DD,
-        epsilon: #ea3884,
-    ),
-    (
-        alpha: #8578b9,
-        beta: #c1badb,
-        gamma: #FDF002,
-        delta: #FEF994,
-        epsilon: #dbb132,
-    ),
-    (
-        alpha: #87bd70,
-        beta: #C4E6B5,
-        gamma: #fe5e6d,
-        delta: #F2BFC5,
-        epsilon: #ce2b3a,
-    ),
-);
-
-// Grays
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000, 40%),
-        '700': lighten(#000, 55%),
-        '600': lighten(#000, 70%),
-        '200': lighten(#000, 80%),
-    ));
-}
-
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #162238,
-        'o-color-2': #fda301,
-        'o-color-3': #f0f4f4,
-        'o-color-4': #ffffff,
-        'o-color-5': #222222,
-
-        'o-cc4-bg': #b4904f,
-
-        'body': 'o-color-3',
-        'menu': 4,
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #f74b94,
-        'o-color-2': #45AADA,
-        'o-color-3': #edf2f4,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #dbb132,
-        'o-color-2': #8578b9,
-        'o-color-3': #f4f4f4,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
+        'bewise-1': (
+            alpha: #11b6a8,
+            beta: #B9EAE8,
+            gamma: #fda301,
+            delta: #febf00,
+            epsilon: #1b7f7e,
+        ),
+        'bewise-2': (
+            alpha: #45AADA,
+            beta: #B3DCF0,
+            gamma: #f74b94,
+            delta: #FDC6DD,
+            epsilon: #ea3884,
+        ),
+        'bewise-3': (
+            alpha: #8578b9,
+            beta: #c1badb,
+            gamma: #FDF002,
+            delta: #FEF994,
+            epsilon: #dbb132,
+        ),
+        'bewise-4': (
+            alpha: #87bd70,
+            beta: #C4E6B5,
+            gamma: #fe5e6d,
+            delta: #F2BFC5,
+            epsilon: #ce2b3a,
+        )
+    )
 );
 
 //------------------------------------------------------------------------------
@@ -148,6 +101,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'bewise-1',
+
         'header-font-size': (20 / 16) * 1rem,
         'font': 'Darker Grotesque',
         'font-size-base': 1.2rem,
@@ -164,3 +119,34 @@ $o-website-values-palettes: (
         'btn-padding-x-lg': 2.5rem,
     ),
 );
+
+$o-palette-priority-prefix: 'bewise';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'bewise-1',
+    2: 'bewise-2',
+    3: 'bewise-3',
+    4: 'generic-1',
+    5: 'generic-2',
+    6: 'generic-3',
+    7: 'generic-4',
+    8: 'generic-5',
+    9: 'generic-6',
+    10: 'generic-7',
+    11: 'generic-8',
+    12: 'generic-9',
+    13: 'generic-10',
+    14: 'generic-11',
+    15: 'generic-12',
+    16: 'generic-13',
+    17: 'generic-14',
+    18: 'generic-15',
+    19: 'generic-16',
+    20: 'generic-17',
+);
+$o-theme-color-palettes-compatibility-indexes: (
+    1: 'bewise-1',
+    2: 'bewise-2',
+    3: 'bewise-3',
+    4: 'bewise-4',
+);
diff --git a/theme_bewise/views/assets.xml b/theme_bewise/views/assets.xml
deleted file mode 100644
index 08f58d260..000000000
--- a/theme_bewise/views/assets.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_bewise/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-
-    <!-- Onboarding Tour -->
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_bewise/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_bewise/views/old_snippets/s_big_icons.xml b/theme_bewise/views/old_snippets/s_big_icons.xml
deleted file mode 100644
index 2e0b4c320..000000000
--- a/theme_bewise/views/old_snippets/s_big_icons.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_big_icons_css_000" inherit_id="theme_common.assets_snippet_s_big_icons_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_bewise/static/src/old_snippets/s_big_icons/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_bewise/views/old_snippets/s_big_image.xml b/theme_bewise/views/old_snippets/s_big_image.xml
deleted file mode 100644
index c144df574..000000000
--- a/theme_bewise/views/old_snippets/s_big_image.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_big_image_css_000" inherit_id="theme_common.assets_snippet_s_big_image_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_bewise/static/src/old_snippets/s_big_image/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_bewise/views/old_snippets/s_big_image_parallax.xml b/theme_bewise/views/old_snippets/s_big_image_parallax.xml
deleted file mode 100644
index 0c5d5293c..000000000
--- a/theme_bewise/views/old_snippets/s_big_image_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_big_image_parallax_css_000" inherit_id="theme_common.assets_snippet_s_big_image_parallax_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_bewise/static/src/old_snippets/s_big_image_parallax/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_bewise/views/old_snippets/s_icon_box.xml b/theme_bewise/views/old_snippets/s_icon_box.xml
deleted file mode 100644
index ab3de8b39..000000000
--- a/theme_bewise/views/old_snippets/s_icon_box.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_icon_box_css_000" inherit_id="theme_common.assets_snippet_s_icon_box_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_bewise/static/src/old_snippets/s_icon_box/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_bistro/__manifest__.py b/theme_bistro/__manifest__.py
index d9d897869..ff2c855bc 100644
--- a/theme_bistro/__manifest__.py
+++ b/theme_bistro/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_library.xml',
 
         'views/snippets/s_cover.xml',
@@ -23,5 +23,10 @@
         'static/description/bistro_screenshot.jpeg',
     ],
     'license': 'LGPL-3',
-    'live_test_url': 'https://theme-bistro.odoo.com'
+    'live_test_url': 'https://theme-bistro.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_bistro/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_bistro/data/ir_asset.xml b/theme_bistro/data/ir_asset.xml
new file mode 100644
index 000000000..9394049e9
--- /dev/null
+++ b/theme_bistro/data/ir_asset.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_bistro.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_bistro.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_bistro/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_bistro.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_bistro.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_bistro/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_bistro/models/theme_bistro.py b/theme_bistro/models/theme_bistro.py
index b5858fb7c..a6b3f28f5 100644
--- a/theme_bistro/models/theme_bistro.py
+++ b/theme_bistro/models/theme_bistro.py
@@ -16,4 +16,5 @@ class ThemeBistro(models.AbstractModel):
         self.enable_view('website.template_footer_slideout')
         self.enable_view('website.option_footer_scrolltop')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
diff --git a/theme_bistro/static/src/scss/primary_variables.scss b/theme_bistro/static/src/scss/primary_variables.scss
index b258e21b1..5185d4c28 100644
--- a/theme_bistro/static/src/scss/primary_variables.scss
+++ b/theme_bistro/static/src/scss/primary_variables.scss
@@ -4,6 +4,8 @@
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'bistro-5',
+
         // Header
         'header-template':                  'vertical',
         'hambuger-type':                    'off-canvas',
@@ -121,163 +123,77 @@ $o-theme-btn-font-weight:                   400;
 // Colors
 //------------------------------------------------------------------------------//
 
-$o-color-palette-number: 5;
-$o-color-palettes: (
-    ( // Palette 1
-        'o-color-1':                        #68b581,
-        'o-color-2':                        #046380,
-        'o-color-3':                        #e8e6d1,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #1d2127,
-
-        'o-cc1-text':                       'o-color-5',
-
-        'menu':                             1,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-    ( // Palette 2
-        'o-color-1':                        #8cc850,
-        'o-color-2':                        #cc4452,
-        'o-color-3':                        #f6f4e1,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #4c4545,
-
-        'o-cc1-text':                       'o-color-5',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-2',
-
-        'menu':                             5,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-    ( // Palette 3
-        'o-color-1':                        #e2ad3b,
-        'o-color-2':                        #1a2a41,
-        'o-color-3':                        #f2ebd5,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #d26400,
-
-        'o-cc1-text':                       'o-color-2',
-        'o-cc2-headings':                   'o-color-2',
-        'o-cc2-link':                       'o-color-2',
-        'o-cc3-headings':                   'o-color-3',
-        'o-cc5-link':                       'o-color-3',
-
-        'menu':                             3,
-        'footer':                           3,
-        'copyright':                        4,
-    ),
-    ( // Palette 4
-        'o-color-1':                        #0092b2,
-        'o-color-2':                        #046380,
-        'o-color-3':                        #f2ebd5,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #a8c545,
-
-        'o-cc1-text':                       #002737,
-        'o-cc2-headings':                   'o-color-2',
-        'o-cc3-headings':                   'o-color-3',
-        'o-cc3-link':                       'o-color-3',
-        'o-cc4-link':                       'o-color-3',
-        'o-cc4-btn-primary':                'o-color-3',
-        'o-cc4-btn-secondary':              'o-color-2',
-        'o-cc5-link':                       'o-color-2',
-        'o-cc5-btn-secondary':              'o-color-2',
-
-        'preheader':                        4,
-        'menu':                             1,
-        'footer':                           3,
-        'copyright':                        4,
-    ),
-    ( // Palette 5
-        'o-color-1':                        #dd7e43,
-        'o-color-2':                        #658791,
-        'o-color-3':                        #9cc264,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #2b2d33,
-
-        'o-cc1-text':                       'o-color-5',
-        'o-cc2-headings':                   'o-color-4',
-        'o-cc2-btn-primary':                'o-color-4',
-        'o-cc2-link':                       'o-color-4',
-        'o-cc3-btn-primary':                'o-color-4',
-        'o-cc3-btn-secondary':              'o-color-5',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc4-btn-primary':                'o-color-4',
-        'o-cc4-btn-secondary':              'o-color-5',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-2',
-        'o-cc5-link':                       'o-color-1',
-
-        'preheader':                        4,
-        'menu':                             5,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-    ( // Palette 6
-        'o-color-1':                        #92b475,
-        'o-color-2':                        #8c7d77,
-        'o-color-3':                        #efefed,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #011a33,
-
-        'o-cc1-text':                       'o-color-5',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc3-btn-secondary':              'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc4-btn-secondary':              'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-4',
-
-        'menu':                             2,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
+    (
+        'bistro-1': (
+            'alpha':                            #68b581,
+            'beta':                             #00a388,
+            'gamma':                            #046380,
+            'delta':                            #4bb5c1,
+            'epsilon':                          #beeb9f,
+        ),
+        'bistro-2': (
+            'alpha':                            #a3cc52,
+            'beta':                             #cc4452,
+            'gamma':                            #8e3557,
+            'delta':                            #f7f2b2,
+            'epsilon':                          #4a1a2c,
+        ),
+        'bistro-3': (
+            'alpha':                            #eebf3e,
+            'beta':                             #e2ad3b,
+            'gamma':                            #bf5c00,
+            'delta':                            #77c4d3,
+            'epsilon':                          #901811,
+        ),
+        'bistro-4': (
+            'alpha':                            #0092b2,
+            'beta':                             #046380,
+            'gamma':                            #a8c545,
+            'delta':                            #fff6c5,
+            'epsilon':                          #ffd55c,
+        ),
+        'bistro-5': (
+            'alpha':                            #dd7e43,
+            'beta':                             #d45c45,
+            'gamma':                            #911146,
+            'delta':                            #9cc264,
+            'epsilon':                          #306e73,
+        ),
+        'bistro-6': (
+            'alpha':                            #b7ca79,
+            'beta':                             #677e52,
+            'gamma':                            #b0cc99,
+            'delta':                            #89725b,
+            'epsilon':                          #f6e8b1,
+        ),
+    )
 );
 
-// Compatibility
-$o-theme-color-palettes: (
-    (
-        'alpha':                            #68b581,
-        'beta':                             #00a388,
-        'gamma':                            #046380,
-        'delta':                            #4bb5c1,
-        'epsilon':                          #beeb9f,
-    ),
-    (
-        'alpha':                            #a3cc52,
-        'beta':                             #cc4452,
-        'gamma':                            #8e3557,
-        'delta':                            #f7f2b2,
-        'epsilon':                          #4a1a2c,
-    ),
-    (
-        'alpha':                            #eebf3e,
-        'beta':                             #e2ad3b,
-        'gamma':                            #bf5c00,
-        'delta':                            #77c4d3,
-        'epsilon':                          #901811,
-    ),
-    (
-        'alpha':                            #0092b2,
-        'beta':                             #046380,
-        'gamma':                            #a8c545,
-        'delta':                            #fff6c5,
-        'epsilon':                          #ffd55c,
-    ),
-    (
-        'alpha':                            #dd7e43,
-        'beta':                             #d45c45,
-        'gamma':                            #911146,
-        'delta':                            #9cc264,
-        'epsilon':                          #306e73,
-    ),
-    (
-        'alpha':                            #b7ca79,
-        'beta':                             #677e52,
-        'gamma':                            #b0cc99,
-        'delta':                            #89725b,
-        'epsilon':                          #f6e8b1,
-    ),
+$o-palette-priority-prefix: 'bistro';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'bistro-1',
+    2: 'bistro-2',
+    3: 'bistro-3',
+    4: 'bistro-4',
+    5: 'bistro-5',
+    6: 'bistro-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
 );
diff --git a/theme_bistro/views/assets.xml b/theme_bistro/views/assets.xml
deleted file mode 100644
index a476c2fa9..000000000
--- a/theme_bistro/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_bistro/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_bistro/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_bistro/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_bookstore/__manifest__.py b/theme_bookstore/__manifest__.py
index 36553814d..040ac5717 100644
--- a/theme_bookstore/__manifest__.py
+++ b/theme_bookstore/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
 
         'views/snippets/s_title.xml',
@@ -17,11 +17,17 @@
         'views/snippets/s_text_image.xml',
         'views/snippets/s_product_list.xml',
         'views/snippets/s_call_to_action.xml',
+        'views/snippets/s_cover.xml',
     ],
     'images': [
         'static/description/bookstore_description.png',
         'static/description/bookstore_screenshot.jpg',
     ],
     'license': 'LGPL-3',
-    'live_test_url': 'https://theme-bookstore.odoo.com'
+    'live_test_url': 'https://theme-bookstore.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_bookstore/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_bookstore/data/ir_asset.xml b/theme_bookstore/data/ir_asset.xml
new file mode 100644
index 000000000..1370227f2
--- /dev/null
+++ b/theme_bookstore/data/ir_asset.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_bookstore.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_bookstore.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_bookstore/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_bookstore.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_bookstore.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_bookstore/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+        <record id="theme_bookstore.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_bookstore.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_bookstore/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_bookstore/static/src/scss/primary_variables.scss b/theme_bookstore/static/src/scss/primary_variables.scss
index d29b2e2f8..e05516e5a 100644
--- a/theme_bookstore/static/src/scss/primary_variables.scss
+++ b/theme_bookstore/static/src/scss/primary_variables.scss
@@ -1,94 +1,3 @@
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #a1a52f,
-        'o-color-2': #66555c,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #242327,
-
-        'o-cc2-link': 'o-color-5',
-        'o-cc5-link': 'o-color-4',
-        'o-cc5-btn-primary': 'o-color-4',
-        'o-cc5-btn-secondary': 'o-color-5',
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #679b96,
-        'o-color-2': #345552,
-        'o-color-3': #e9e9e9,
-        'o-color-4': #ffffff,
-        'o-color-5': #1e222f,
-
-        'o-cc2-link': 'o-color-5',
-        'o-cc2-headings': 'o-color-5',
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #df699c,
-        'o-color-2': #590046,
-        'o-color-3': #dbe8ed,
-        'o-color-4': #ffffff,
-        'o-color-5': #222222,
-
-        'o-cc2-link': 'o-color-5',
-        'o-cc2-headings': 'o-color-5',
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #b29964,
-        'o-color-2': #62624c,
-        'o-color-3': #f5f4f4,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'o-cc2-link': 'o-color-5',
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #1ad68f,
-        'o-color-2': #2e2e2e,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'o-cc2-link': 'o-color-5',
-        'o-cc4-link': 'o-color-5',
-        'o-cc4-text': 'o-color-5',
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #cfd744,
-        'o-color-2': #3d504a,
-        'o-color-3': #f0f1f1,
-        'o-color-4': #ffffff,
-        'o-color-5': #112625,
-
-        'o-cc2-link': 'o-color-5',
-        'o-cc4-link': 'o-color-5',
-        'o-cc4-text': 'o-color-5',
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -149,6 +58,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'bookstore-1',
         'header-font-size': (18 / 16) * 1rem,
         'btn-border-radius': 0px,
         'btn-border-radius-sm': 0px,
@@ -162,3 +72,31 @@ $o-website-values-palettes: (
         'header-links-style': 'border-bottom',
     ),
 );
+
+$o-palette-priority-prefix: 'bookstore';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'bookstore-1',
+    2: 'bookstore-2',
+    3: 'bookstore-3',
+    4: 'bookstore-4',
+    5: 'bookstore-5',
+    6: 'bookstore-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
+);
diff --git a/theme_bookstore/views/assets.xml b/theme_bookstore/views/assets.xml
deleted file mode 100644
index 613b62435..000000000
--- a/theme_bookstore/views/assets.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_bookstore/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_bookstore/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_bookstore/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_bookstore/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_bookstore/views/snippets/s_cover.xml b/theme_bookstore/views/snippets/s_cover.xml
new file mode 100644
index 000000000..b2f429625
--- /dev/null
+++ b/theme_bookstore/views/snippets/s_cover.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="s_cover" inherit_id="website.s_cover">
+        <!-- Section -->
+        <xpath expr="//section" position="attributes">
+            <attribute name="class" add="pt64 pb64 o_half_screen_height s_parallax_no_overflow_hidden bg-black-50" remove="parallax s_parallax_is_fixed" separator=" "/>
+            <attribute name="data-scroll-background-ratio">0</attribute>
+            <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 55%;</attribute>
+        </xpath>
+        <!-- Parallax -->
+        <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
+    </template>
+</odoo>
diff --git a/theme_clean/__manifest__.py b/theme_clean/__manifest__.py
index d37dcd346..fc728fd55 100644
--- a/theme_clean/__manifest__.py
+++ b/theme_clean/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/image_content.xml',
 
         'views/snippets/s_cover.xml',
@@ -23,4 +23,9 @@
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-clean.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_clean/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_clean/data/ir_asset.xml b/theme_clean/data/ir_asset.xml
new file mode 100644
index 000000000..46af15fe4
--- /dev/null
+++ b/theme_clean/data/ir_asset.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_clean.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_clean.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_clean/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_clean.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_clean.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_clean/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_clean/static/src/scss/primary_variables.scss b/theme_clean/static/src/scss/primary_variables.scss
index 9c59b2245..599e961d1 100644
--- a/theme_clean/static/src/scss/primary_variables.scss
+++ b/theme_clean/static/src/scss/primary_variables.scss
@@ -3,84 +3,86 @@
 //------------------------------------------------------------------------------
 
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #bdc3c7,
-        'beta': #95a5a6,
-        'gamma': #2980b9,
-        'delta': #3498db,
-        'epsilon': #34495e,
-    ),
-    (
-        'alpha': #bdc3c7,
-        'beta': #7a58b2,
-        'gamma': #593d87,
-        'delta': #39225f,
-        'epsilon': #2c3e50,
-    ),
-    (
-        'alpha': #c5bcb1,
-        'beta': #e67e22,
-        'gamma': #c0392b,
-        'delta': #e74c3c,
-        'epsilon': #d35400,
-    ),
-    (
-        'alpha': #c5bcb1,
-        'beta': #f1c40f,
-        'gamma': #f3ac12,
-        'delta': #e67e22,
-        'epsilon': #d35400,
-    ),
-    (
-        'alpha': #ecf0f1,
-        'beta': #bdc3c7,
-        'gamma': #27ae60,
-        'delta': #254c3a,
-        'epsilon': #2ecc71,
-    ),
-    (
-        'alpha': #ecf0f1,
-        'beta': #bdc3c7,
-        'gamma': #7f8c8d,
-        'delta': #445b5c,
-        'epsilon': #34495e,
-    ),
+        'clean-1': (
+            'alpha': #bdc3c7,
+            'beta': #95a5a6,
+            'gamma': #2980b9,
+            'delta': #3498db,
+            'epsilon': #34495e,
+        ),
+        'clean-2': (
+            'alpha': #bdc3c7,
+            'beta': #7a58b2,
+            'gamma': #593d87,
+            'delta': #39225f,
+            'epsilon': #2c3e50,
+        ),
+        'clean-3': (
+            'alpha': #c5bcb1,
+            'beta': #e67e22,
+            'gamma': #c0392b,
+            'delta': #e74c3c,
+            'epsilon': #d35400,
+        ),
+        'clean-4': (
+            'alpha': #c5bcb1,
+            'beta': #f1c40f,
+            'gamma': #f3ac12,
+            'delta': #e67e22,
+            'epsilon': #d35400,
+        ),
+        'clean-5': (
+            'alpha': #ecf0f1,
+            'beta': #bdc3c7,
+            'gamma': #27ae60,
+            'delta': #254c3a,
+            'epsilon': #2ecc71,
+        ),
+        'clean-6': (
+            'alpha': #ecf0f1,
+            'beta': #bdc3c7,
+            'gamma': #7f8c8d,
+            'delta': #445b5c,
+            'epsilon': #34495e,
+        )
+    )
 );
 
 @if $o-support-13-0-color-system {
     $-status-color-palettes: (
-        (
+        'clean-1': (
             'success': #2980b9,
             'info': #1abc9c,
             'warning': #36495e,
             'danger': #2c3e50,
         ),
-        (
+        'clean-2': (
             'success': #593d87,
             'info': #39225f,
             'warning': #2c3e50,
             'danger': #c0392b,
         ),
-        (
+        'clean-3': (
             'success': #c0392b,
             'info': #e67e22,
             'warning': #c5bcb1,
             'danger': #d35400,
         ),
-        (
+        'clean-4': (
             'success': #f3ac12,
             'info': #f1c40f,
             'warning': #c0392b,
             'danger': #d35400,
         ),
-        (
+        'clean-5': (
             'success': #27ae60,
             'info': #254c3a,
             'warning': #34495e,
             'danger': #2c3e50,
         ),
-        (
+        'clean-6': (
             'success': #bdc3c7,
             'info': #7f8c8d,
             'warning': #445b5c,
@@ -89,85 +91,13 @@ $o-theme-color-palettes: (
     );
     $-palettes: $o-theme-color-palettes;
     $o-theme-color-palettes: ();
-    @for $index from 1 through length($-palettes) {
-        $o-theme-color-palettes: append($o-theme-color-palettes, map-merge(nth($-palettes, $index), nth($-status-color-palettes, $index)));
+    @each $key in map-keys($-palettes) {
+        $o-theme-color-palettes: map-merge($o-theme-color-palettes, (
+            $key: map-merge(map-get($-palettes, $key), map-get($-status-color-palettes, $key) or ()),
+        ));
     }
 }
 
-// Grays
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000, 40%),
-        '600': lighten(#000, 70%),
-        '200': lighten(#000, 80%),
-    ));
-}
-
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #3498db,
-        'o-color-2': #34495e,
-        'o-color-3': #e5edf2,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #7a58b2,
-        'o-color-2': #4e3575,
-        'o-color-3': #ecece4,
-        'o-color-4': #ffffff,
-        'o-color-5': #2c3e50,
-
-        'o-cc1-headings': 'o-color-5',
-        'o-cc5-link': #b9a1df,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #f85fa6,
-        'o-color-2': #a3416f,
-        'o-color-3': #e0e9f2,
-        'o-color-4': #ffffff,
-        'o-color-5': #222222,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #3d91db,
-        'o-color-2': #995528,
-        'o-color-3': #f0edeb,
-        'o-color-4': #ffffff,
-        'o-color-5': #222222,
-
-        'o-cc3-bg': #583e2d,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #53aeb4,
-        'o-color-2': #7f8c8d,
-        'o-color-3': #eef3f6,
-        'o-color-4': #ffffff,
-        'o-color-5': #34495e,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -264,6 +194,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'clean-1',
         'headings-font': 'Dosis',
         'navbar-font': 'Dosis',
         'buttons-font': 'Dosis',
@@ -273,3 +204,38 @@ $o-website-values-palettes: (
         'footer-template': 'contact',
     ),
 );
+
+$o-palette-priority-prefix: 'clean';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'clean-1',
+    2: 'clean-2',
+    3: 'clean-3',
+    4: 'clean-4',
+    5: 'clean-5',
+    6: 'generic-1',
+    7: 'generic-2',
+    8: 'generic-3',
+    9: 'generic-4',
+    10: 'generic-5',
+    11: 'generic-6',
+    12: 'generic-7',
+    13: 'generic-8',
+    14: 'generic-9',
+    15: 'generic-10',
+    16: 'generic-11',
+    17: 'generic-12',
+    18: 'generic-13',
+    19: 'generic-14',
+    20: 'generic-15',
+    21: 'generic-16',
+    22: 'generic-17',
+);
+$o-theme-color-palettes-compatibility-indexes: (
+    1: 'clean-1',
+    2: 'clean-2',
+    3: 'clean-3',
+    4: 'clean-4',
+    5: 'clean-5',
+    6: 'clean-6',
+);
diff --git a/theme_clean/views/assets.xml b/theme_clean/views/assets.xml
deleted file mode 100644
index 34e87317c..000000000
--- a/theme_clean/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_clean/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_clean/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_clean/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_cobalt/__manifest__.py b/theme_cobalt/__manifest__.py
index e07985fa5..5669fb5f4 100644
--- a/theme_cobalt/__manifest__.py
+++ b/theme_cobalt/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['website'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
         'views/customizations.xml',
     ],
@@ -17,5 +17,10 @@
         'static/description/cobalt_screenshot.jpg',
     ],
     'license': 'LGPL-3',
-    'live_test_url': 'https://theme-cobalt.odoo.com'
+    'live_test_url': 'https://theme-cobalt.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_cobalt/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_cobalt/data/ir_asset.xml b/theme_cobalt/data/ir_asset.xml
new file mode 100644
index 000000000..179ed8dd3
--- /dev/null
+++ b/theme_cobalt/data/ir_asset.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_cobalt.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_cobalt.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_cobalt/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_cobalt.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_cobalt.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_cobalt/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_cobalt/models/theme_cobalt.py b/theme_cobalt/models/theme_cobalt.py
index 1f00f824e..ba8dba975 100644
--- a/theme_cobalt/models/theme_cobalt.py
+++ b/theme_cobalt/models/theme_cobalt.py
@@ -6,7 +6,8 @@ class ThemeCobalt(models.AbstractModel):
 
     def _theme_cobalt_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-2')
+        # self.enable_asset('theme_common.compatibility_saas_10_2')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
         self.enable_header_off_canvas()
diff --git a/theme_cobalt/static/src/img/pictures/s_banner.jpg b/theme_cobalt/static/src/img/pictures/s_banner.jpg
index 4b5878478..e1946f34d 100644
Binary files a/theme_cobalt/static/src/img/pictures/s_banner.jpg and b/theme_cobalt/static/src/img/pictures/s_banner.jpg differ
diff --git a/theme_cobalt/static/src/scss/primary_variables.scss b/theme_cobalt/static/src/scss/primary_variables.scss
index 46844ff2c..a6bce0e63 100644
--- a/theme_cobalt/static/src/scss/primary_variables.scss
+++ b/theme_cobalt/static/src/scss/primary_variables.scss
@@ -1,27 +1,3 @@
-//------------------------------------------------------------------------------
-// Colors
-//------------------------------------------------------------------------------
-
-$o-color-palettes: (
-    (   // Palette 1
-        'o-color-1': #116466,
-        'o-color-2': #2B3737,
-        'o-color-3': #F6F4F2,
-        'o-color-4': #ffffff,
-        'o-color-5': #a9bcbc,
-
-        'o-cc3-headings': 'o-color-3',
-        'o-cc3-text': 'o-color-5',
-        'o-cc3-link': 'o-color-4',
-        'o-cc3-btn-primary': 'o-color-4',
-        'o-cc3-btn-secondary': 'o-color-5',
-
-        'header': 1,
-        'footer': 3,
-        'copyright': 'black-15',
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -52,6 +28,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'cobalt-1',
+
         'font': 'Inter',
         'headings-font': 'Inter',
         'navbar-font': 'Inter',
@@ -73,3 +51,26 @@ $o-website-values-palettes: (
         'btn-padding-x-lg': 3.3rem,
     ),
 );
+
+$o-palette-priority-prefix: 'cobalt';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'cobalt-1',
+    2: 'generic-1',
+    3: 'generic-2',
+    4: 'generic-3',
+    5: 'generic-4',
+    6: 'generic-5',
+    7: 'generic-6',
+    8: 'generic-7',
+    9: 'generic-8',
+    10: 'generic-9',
+    11: 'generic-10',
+    12: 'generic-11',
+    13: 'generic-12',
+    14: 'generic-13',
+    15: 'generic-14',
+    16: 'generic-15',
+    17: 'generic-16',
+    18: 'generic-17',
+);
diff --git a/theme_cobalt/views/assets.xml b/theme_cobalt/views/assets.xml
deleted file mode 100644
index 27aa32f24..000000000
--- a/theme_cobalt/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_cobalt/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_cobalt/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-
-    <!-- Onboarding Tour -->
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_cobalt/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index 78b3c7f42..40c80c742 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -19,6 +19,28 @@
 
 <!-- Snippets -->
 
+<!-- ==== Banner ===== -->
+<template id="s_banner" inherit_id="website.s_banner" name="Cobalt s_banner">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt152 pb152 o_half_screen_height" remove="pt96 pb96" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="offset-lg-6 p-5 shadow-lg rounded" remove="pt32 pb32" separator=" "/>
+    </xpath>
+    <xpath expr="//h1" position="replace">
+        <h1>Reach more People.<br/>Grow your Business.</h1><br/>
+    </xpath>
+    <xpath expr="//p" position="replace">
+        <p class="lead">Building game-changing digital experiences designed to set your brand apart.</p>
+    </xpath>
+    <xpath expr="//a" position="before">
+        <br/>
+    </xpath>
+    <xpath expr="//a" position="replace">
+        <a href="#" class="btn btn-primary mb-2">Start now</a>
+    </xpath>
+</template>
+
 <!-- ==== Image-Text ===== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Cobalt s_image_text">
     <xpath expr="//section" position="attributes">
@@ -35,15 +57,16 @@
     </xpath>
 
     <xpath expr="//h2" position="replace">
-        <h1>Reach more People.<br/>Grow your Business.</h1><br/>
+        <h1>Digital strategy synchronising multiple channels</h1><br/>
     </xpath>
 
-    <xpath expr="//p" position="replace"/>
-    <xpath expr="//p" position="replace"/>
-
-    <xpath expr="//a[hasclass('btn')]" position="replace">
-        <a href="#" class="btn btn-primary btn-lg mb-2">START NOW</a>
+    <xpath expr="//p" position="replace">
+        <p>We create a consistent customer experience through a detailed digital strategy built on precise customer research.</p>
     </xpath>
+
+    <xpath expr="//p[last()-1]" position="replace"/>
+
+    <xpath expr="//a[hasclass('btn')]" position="replace"/>
 </template>
 
 <!-- ==== Text-Image ===== -->
@@ -162,12 +185,16 @@
         <div class="o_we_shape o_web_editor_Bold_01 o_we_flip_y"></div>
     </xpath>
 
+    <xpath expr="//div[hasclass('container')]" position="attributes">
+        <attribute name="class" add="container-fluid px-5 px-lg-0" remove="container" separator=" "/>
+    </xpath>
+
     <xpath expr="//h2" position="replace"/>
     <xpath expr="//p" position="replace"/>
     <xpath expr="//p" position="replace"/>
 
     <xpath expr="//img" position="attributes">
-        <attribute name="class" add="" remove="img-thumbnail padding-large" separator=" "/>
+        <attribute name="class" add="img-fluid" remove="img-thumbnail padding-large" separator=" "/>
     </xpath>
 
     <xpath expr="//figcaption" position="replace">
@@ -175,7 +202,7 @@
     </xpath>
 
     <xpath expr="//div[hasclass('row')]/div" position="before">
-        <div class="col col-lg-5">
+        <div class="col offset-lg-2">
             <h2>Our Offices</h2>
             <p/>
             <div class="row">
@@ -198,7 +225,7 @@
     </xpath>
 
     <xpath expr="//div[hasclass('offset-lg-1')]" position="attributes">
-        <attribute name="class" add="col-lg-6" remove="col-lg-10" separator=" "/>
+        <attribute name="class" add="col-lg-6 px-0" remove="col-lg-10" separator=" "/>
         <attribute name="style" remove="text-align: center;" separator=";"/>
     </xpath>
 </template>
diff --git a/theme_common/__manifest__.py b/theme_common/__manifest__.py
index a1ccbfb6a..522c61cca 100644
--- a/theme_common/__manifest__.py
+++ b/theme_common/__manifest__.py
@@ -7,44 +7,9 @@
     'depends': ['website'],
     'data': [
         'data/data.xml',
-        'views/assets.xml',
-        'views/theme_common_templates.xml',
-
-        'views/old_snippets/s_animated_boxes.xml',
-        'views/old_snippets/s_banner_parallax.xml',
-        'views/old_snippets/s_big_icons.xml',
-        'views/old_snippets/s_big_image.xml',
-        'views/old_snippets/s_big_image_parallax.xml',
-        'views/old_snippets/s_clonable_boxes.xml',
-        'views/old_snippets/s_color_blocks_4.xml',
-        'views/old_snippets/s_color_blocks_img.xml',
         'views/old_snippets/s_column.xml',
-        'views/old_snippets/s_compact_menu.xml',
-        'views/old_snippets/s_css_slider.xml',
-        'views/old_snippets/s_discount.xml',
-        'views/old_snippets/s_event_list.xml',
-        'views/old_snippets/s_event_slide.xml',
-        'views/old_snippets/s_features_carousel.xml',
-        'views/old_snippets/s_full_menu.xml',
-        'views/old_snippets/s_header_text_big_picture.xml',
-        'views/old_snippets/s_icon_box.xml',
-        'views/old_snippets/s_images_carousel.xml',
-        'views/old_snippets/s_images_row.xml',
-        'views/old_snippets/s_menu_three_columns.xml',
-        'views/old_snippets/s_mini_nav_bar.xml',
-        'views/old_snippets/s_news_carousel.xml',
         'views/old_snippets/s_page_header.xml',
-        'views/old_snippets/s_pricing.xml',
-        'views/old_snippets/s_products_carousel.xml',
-        'views/old_snippets/s_profile.xml',
-        'views/old_snippets/s_progress.xml',
-        'views/old_snippets/s_separator_nav.xml',
-        'views/old_snippets/s_showcase_image.xml',
-        'views/old_snippets/s_showcase_slider.xml',
-        'views/old_snippets/s_team_profiles.xml',
-        'views/old_snippets/s_text_picture_text.xml',
         'views/old_snippets/s_three_columns_circle.xml',
-        'views/old_snippets/s_two_columns.xml',
-    ],
+        ],
     'application': False,
 }
diff --git a/theme_common/data/ir_asset.xml b/theme_common/data/ir_asset.xml
new file mode 100644
index 000000000..8a63cb30e
--- /dev/null
+++ b/theme_common/data/ir_asset.xml
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_common.s_clonable_boxes_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_clonable_boxes_000_scss</field>
+            <field name="name">Clonable boxes 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_clonable_boxes/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_banner_parallax_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_banner_parallax_000_scss</field>
+            <field name="name">Banner parallax 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_banner_parallax/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_features_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_features_carousel_000_variables_scss</field>
+            <field name="name">Features carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_features_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_features_carousel_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_features_carousel_000_scss</field>
+            <field name="name">Features carousel 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_features_carousel/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_text_picture_text_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_text_picture_text_000_scss</field>
+            <field name="name">Text picture text 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_text_picture_text/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_color_blocks_4_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_color_blocks_4_000_scss</field>
+            <field name="name">Color blocks 4 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_color_blocks_4/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_products_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_products_carousel_000_variables_scss</field>
+            <field name="name">Products carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_products_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_products_carousel_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_products_carousel_000_scss</field>
+            <field name="name">Products carousel 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_products_carousel/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_two_columns_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_two_columns_000_scss</field>
+            <field name="name">Two columns 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_two_columns/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_big_image_parallax_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_big_image_parallax_000_scss</field>
+            <field name="name">Big image parallax 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_big_image_parallax/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_news_carousel_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_news_carousel_000_scss</field>
+            <field name="name">News carousel 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_news_carousel/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_event_list_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_event_list_000_variables_scss</field>
+            <field name="name">Event list 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_event_list/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_event_list_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_event_list_000_scss</field>
+            <field name="name">Event list 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_event_list/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_images_row_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_images_row_000_scss</field>
+            <field name="name">Images row 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_images_row/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_profile_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_profile_000_scss</field>
+            <field name="name">Profile 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_profile/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_showcase_slider_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_showcase_slider_000_variables_scss</field>
+            <field name="name">Showcase slider 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_showcase_slider/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_showcase_slider_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_showcase_slider_000_scss</field>
+            <field name="name">Showcase slider 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_showcase_slider/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_showcase_slider_000_js" model="theme.ir.asset">
+            <field name="key">theme_common.s_showcase_slider_000_js</field>
+            <field name="name">Showcase slider 000 JS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_showcase_slider/000.js</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_full_menu_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_full_menu_000_scss</field>
+            <field name="name">Full menu 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_full_menu/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_team_profiles_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_team_profiles_000_scss</field>
+            <field name="name">Team profiles 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_team_profiles/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_separator_nav_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_separator_nav_000_scss</field>
+            <field name="name">Separator nav 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_separator_nav/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_compact_menu_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_compact_menu_000_scss</field>
+            <field name="name">Compact menu 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_compact_menu/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_big_image_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_big_image_000_scss</field>
+            <field name="name">Big image 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_big_image/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_menu_three_columns_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_menu_three_columns_000_scss</field>
+            <field name="name">Menu three columns 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_menu_three_columns/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_event_slide_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_event_slide_000_scss</field>
+            <field name="name">Event slide 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_event_slide/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_animated_boxes_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_animated_boxes_000_scss</field>
+            <field name="name">Animated boxes 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_animated_boxes/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_animated_boxes_000_js" model="theme.ir.asset">
+            <field name="key">theme_common.s_animated_boxes_000_js</field>
+            <field name="name">Animated boxes 000 JS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_animated_boxes/000.js</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_css_slider_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_css_slider_000_variables_scss</field>
+            <field name="name">Css slider 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_css_slider/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_css_slider_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_css_slider_000_scss</field>
+            <field name="name">Css slider 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_css_slider/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_css_slider_000_js" model="theme.ir.asset">
+            <field name="key">theme_common.s_css_slider_000_js</field>
+            <field name="name">Css slider 000 JS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_css_slider/000.js</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_color_blocks_img_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_color_blocks_img_000_scss</field>
+            <field name="name">Color blocks img 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_color_blocks_img/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_showcase_image_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_showcase_image_000_variables_scss</field>
+            <field name="name">Showcase image 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_showcase_image/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_showcase_image_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_showcase_image_000_scss</field>
+            <field name="name">Showcase image 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_showcase_image/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_pricing_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_pricing_000_scss</field>
+            <field name="name">Pricing 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_pricing/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_header_text_big_picture_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_header_text_big_picture_000_scss</field>
+            <field name="name">Header text big picture 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_header_text_big_picture/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_progress_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_progress_000_scss</field>
+            <field name="name">Progress 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_progress/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_icon_box_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_icon_box_000_scss</field>
+            <field name="name">Icon box 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_icon_box/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_big_icons_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_big_icons_000_variables_scss</field>
+            <field name="name">Big icons 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_big_icons/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_big_icons_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_big_icons_000_scss</field>
+            <field name="name">Big icons 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_big_icons/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_mini_nav_bar_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_mini_nav_bar_000_scss</field>
+            <field name="name">Mini nav bar 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_mini_nav_bar/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_mini_nav_bar_000_js" model="theme.ir.asset">
+            <field name="key">theme_common.s_mini_nav_bar_000_js</field>
+            <field name="name">Mini nav bar 000 JS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_mini_nav_bar/000.js</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_discount_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_discount_000_variables_scss</field>
+            <field name="name">Discount 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_discount/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_discount_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_discount_000_scss</field>
+            <field name="name">Discount 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_discount/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.s_images_carousel_000_scss" model="theme.ir.asset">
+            <field name="key">theme_common.s_images_carousel_000_scss</field>
+            <field name="name">Images carousel 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/old_snippets/s_images_carousel/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.option_colors_02_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.option_colors_02_variables_scss</field>
+            <field name="name">Option colors 02 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/options/colors/option_colors_02_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.option_colors_03_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.option_colors_03_variables_scss</field>
+            <field name="name">Option colors 03 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/options/colors/option_colors_03_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.option_colors_04_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.option_colors_04_variables_scss</field>
+            <field name="name">Option colors 04 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/options/colors/option_colors_04_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.option_colors_05_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.option_colors_05_variables_scss</field>
+            <field name="name">Option colors 05 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/options/colors/option_colors_05_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.option_colors_06_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.option_colors_06_variables_scss</field>
+            <field name="name">Option colors 06 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/options/colors/option_colors_06_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.option_colors_07_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.option_colors_07_variables_scss</field>
+            <field name="name">Option colors 07 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/options/colors/option_colors_07_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.option_colors_08_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.option_colors_08_variables_scss</field>
+            <field name="name">Option colors 08 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/options/colors/option_colors_08_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.option_colors_09_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.option_colors_09_variables_scss</field>
+            <field name="name">Option colors 09 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/options/colors/option_colors_09_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_common/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_common.fonts_scss" model="theme.ir.asset">
+            <field name="key">theme_common.fonts_scss</field>
+            <field name="name">Fonts SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_common/static/src/scss/fonts.scss</field>
+        </record>
+
+        <record id="theme_common.compatibility_saas_10_1_scss" model="theme.ir.asset">
+            <field name="key">theme_common.compatibility_saas_10_1_scss</field>
+            <field name="name">Compatibility saas 10 1 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">/theme_common/static/src/scss/compatibility-saas-10-1.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.compatibility_saas_10_2_scss" model="theme.ir.asset">
+            <field name="key">theme_common.compatibility_saas_10_2_scss</field>
+            <field name="name">Compatibility saas 10 2 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">/theme_common/static/src/scss/compatibility-saas-10-2.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_common.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_common/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_common.compatibility_saas_11_4_scss" model="theme.ir.asset">
+            <field name="key">theme_common.compatibility_saas_11_4_scss</field>
+            <field name="name">Compatibility saas 11 4 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">/theme_common/static/src/scss/compatibility-saas-11.4.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_common/models/theme_common.py b/theme_common/models/theme_common.py
index 7e39a159d..dcd956545 100644
--- a/theme_common/models/theme_common.py
+++ b/theme_common/models/theme_common.py
@@ -6,9 +6,14 @@ class ThemeCommon(models.AbstractModel):
 
     def _theme_common_post_copy(self, mod):
         # Reset all default color when switching themes
-        for nb in range(2, 9):
-            self.disable_view('theme_common.option_colors_%02d_variables' % nb)
+        self.disable_asset('theme_common.option_colors_02_variables')
+        self.disable_asset('theme_common.option_colors_03_variables')
+        self.disable_asset('theme_common.option_colors_04_variables')
+        self.disable_asset('theme_common.option_colors_05_variables')
+        self.disable_asset('theme_common.option_colors_06_variables')
+        self.disable_asset('theme_common.option_colors_07_variables')
+        self.disable_asset('theme_common.option_colors_08_variables')
 
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-11-4-variables')
-        # self.enable_view('theme_common.compatibility-saas-11-4')
+        # self.enable_asset('theme_common.compatibility_saas_11_4_variables')
+        # self.enable_asset('theme_common.compatibility_saas_11_4')
diff --git a/theme_common/static/src/scss/options/colors/option_colors_02_variables.scss b/theme_common/static/src/scss/options/colors/option_colors_02_variables.scss
index 2823f135f..4898dc524 100644
--- a/theme_common/static/src/scss/options/colors/option_colors_02_variables.scss
+++ b/theme_common/static/src/scss/options/colors/option_colors_02_variables.scss
@@ -1,3 +1 @@
 $o-color-palette-number: 2;
-$o-theme-color-palette-number: 2;
-$o-gray-color-palette-number: 2;
diff --git a/theme_common/static/src/scss/options/colors/option_colors_03_variables.scss b/theme_common/static/src/scss/options/colors/option_colors_03_variables.scss
index 9bdce540e..81d8c1a4a 100644
--- a/theme_common/static/src/scss/options/colors/option_colors_03_variables.scss
+++ b/theme_common/static/src/scss/options/colors/option_colors_03_variables.scss
@@ -1,3 +1 @@
 $o-color-palette-number: 3;
-$o-theme-color-palette-number: 3;
-$o-gray-color-palette-number: 3;
diff --git a/theme_common/static/src/scss/options/colors/option_colors_04_variables.scss b/theme_common/static/src/scss/options/colors/option_colors_04_variables.scss
index 9150d4345..e99d9111d 100644
--- a/theme_common/static/src/scss/options/colors/option_colors_04_variables.scss
+++ b/theme_common/static/src/scss/options/colors/option_colors_04_variables.scss
@@ -1,3 +1 @@
 $o-color-palette-number: 4;
-$o-theme-color-palette-number: 4;
-$o-gray-color-palette-number: 4;
diff --git a/theme_common/static/src/scss/options/colors/option_colors_05_variables.scss b/theme_common/static/src/scss/options/colors/option_colors_05_variables.scss
index 58021de79..1494c8c8b 100644
--- a/theme_common/static/src/scss/options/colors/option_colors_05_variables.scss
+++ b/theme_common/static/src/scss/options/colors/option_colors_05_variables.scss
@@ -1,3 +1 @@
 $o-color-palette-number: 5;
-$o-theme-color-palette-number: 5;
-$o-gray-color-palette-number: 5;
diff --git a/theme_common/static/src/scss/options/colors/option_colors_06_variables.scss b/theme_common/static/src/scss/options/colors/option_colors_06_variables.scss
index bd9a2b5bb..630e9f8cf 100644
--- a/theme_common/static/src/scss/options/colors/option_colors_06_variables.scss
+++ b/theme_common/static/src/scss/options/colors/option_colors_06_variables.scss
@@ -1,3 +1 @@
 $o-color-palette-number: 6;
-$o-theme-color-palette-number: 6;
-$o-gray-color-palette-number: 6;
diff --git a/theme_common/static/src/scss/options/colors/option_colors_07_variables.scss b/theme_common/static/src/scss/options/colors/option_colors_07_variables.scss
index 464ff4af3..e0edcd423 100644
--- a/theme_common/static/src/scss/options/colors/option_colors_07_variables.scss
+++ b/theme_common/static/src/scss/options/colors/option_colors_07_variables.scss
@@ -1,3 +1 @@
 $o-color-palette-number: 7;
-$o-theme-color-palette-number: 7;
-$o-gray-color-palette-number: 7;
diff --git a/theme_common/static/src/scss/options/colors/option_colors_08_variables.scss b/theme_common/static/src/scss/options/colors/option_colors_08_variables.scss
index 6fa642a9f..2472017ba 100644
--- a/theme_common/static/src/scss/options/colors/option_colors_08_variables.scss
+++ b/theme_common/static/src/scss/options/colors/option_colors_08_variables.scss
@@ -1,3 +1 @@
 $o-color-palette-number: 8;
-$o-theme-color-palette-number: 8;
-$o-gray-color-palette-number: 8;
diff --git a/theme_common/static/src/scss/options/colors/option_colors_09_variables.scss b/theme_common/static/src/scss/options/colors/option_colors_09_variables.scss
index da879d234..742c71f1b 100644
--- a/theme_common/static/src/scss/options/colors/option_colors_09_variables.scss
+++ b/theme_common/static/src/scss/options/colors/option_colors_09_variables.scss
@@ -1,3 +1 @@
 $o-color-palette-number: 9;
-$o-theme-color-palette-number: 9;
-$o-gray-color-palette-number: 9;
diff --git a/theme_common/views/assets.xml b/theme_common/views/assets.xml
deleted file mode 100644
index 5f9f76e21..000000000
--- a/theme_common/views/assets.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_utils" inherit_id="web._assets_utils">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/mixins.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_frontend" inherit_id="website.assets_frontend" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/fonts.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_common/static/src/js/compatibility_editor.js"/>
-        </xpath>
-    </template>
-
-    <!-- Compatibility templates -->
-
-    <template id="compatibility-saas-10-1" name="Compatibility for saas-10 - 1" inherit_id="website.assets_frontend" priority="1" active="False">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/compatibility-saas-10-1.scss"/>
-        </xpath>
-    </template>
-
-    <template id="compatibility-saas-10-2" name="Compatibility for saas-10 - 2" inherit_id="website.assets_frontend" priority="1" active="False">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/compatibility-saas-10-2.scss"/>
-        </xpath>
-    </template>
-
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="website._assets_primary_variables" priority="1" active="False">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4" name="Compatibility for saas-11.4" inherit_id="website.assets_frontend" priority="1" active="False">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/compatibility-saas-11.4.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_common/views/old_snippets/s_animated_boxes.xml b/theme_common/views/old_snippets/s_animated_boxes.xml
deleted file mode 100644
index ec32a77d7..000000000
--- a/theme_common/views/old_snippets/s_animated_boxes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_animated_boxes_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_animated_boxes/000.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_animated_boxes_js_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/theme_common/static/src/old_snippets/s_animated_boxes/000.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_banner_parallax.xml b/theme_common/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index 3e04edb65..000000000
--- a/theme_common/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_banner_parallax_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_banner_parallax/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_big_icons.xml b/theme_common/views/old_snippets/s_big_icons.xml
deleted file mode 100644
index c5cc82def..000000000
--- a/theme_common/views/old_snippets/s_big_icons.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_big_icons_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_big_icons/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_big_icons_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_big_icons/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_big_image.xml b/theme_common/views/old_snippets/s_big_image.xml
deleted file mode 100644
index f271ed7ae..000000000
--- a/theme_common/views/old_snippets/s_big_image.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_big_image_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_big_image/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_big_image_parallax.xml b/theme_common/views/old_snippets/s_big_image_parallax.xml
deleted file mode 100644
index fc2a49aea..000000000
--- a/theme_common/views/old_snippets/s_big_image_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_big_image_parallax_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_big_image_parallax/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_clonable_boxes.xml b/theme_common/views/old_snippets/s_clonable_boxes.xml
deleted file mode 100644
index 6926e69a3..000000000
--- a/theme_common/views/old_snippets/s_clonable_boxes.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_clonable_boxes_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_clonable_boxes/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_color_blocks_4.xml b/theme_common/views/old_snippets/s_color_blocks_4.xml
deleted file mode 100644
index e982eb436..000000000
--- a/theme_common/views/old_snippets/s_color_blocks_4.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_color_blocks_4_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_color_blocks_4/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_color_blocks_img.xml b/theme_common/views/old_snippets/s_color_blocks_img.xml
deleted file mode 100644
index bff2ffd31..000000000
--- a/theme_common/views/old_snippets/s_color_blocks_img.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_color_blocks_img_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_color_blocks_img/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_compact_menu.xml b/theme_common/views/old_snippets/s_compact_menu.xml
deleted file mode 100644
index 3703ba9f7..000000000
--- a/theme_common/views/old_snippets/s_compact_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_compact_menu_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_compact_menu/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_css_slider.xml b/theme_common/views/old_snippets/s_css_slider.xml
deleted file mode 100644
index d63d3b01e..000000000
--- a/theme_common/views/old_snippets/s_css_slider.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_css_slider_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_css_slider/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_css_slider_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_css_slider/000.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_css_slider_js_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/theme_common/static/src/old_snippets/s_css_slider/000.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_discount.xml b/theme_common/views/old_snippets/s_discount.xml
deleted file mode 100644
index ed0188cfc..000000000
--- a/theme_common/views/old_snippets/s_discount.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_discount_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_discount/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_discount_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_discount/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_event_list.xml b/theme_common/views/old_snippets/s_event_list.xml
deleted file mode 100644
index d9fc2a619..000000000
--- a/theme_common/views/old_snippets/s_event_list.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_event_list_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_event_list/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_event_list_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_event_list/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_event_slide.xml b/theme_common/views/old_snippets/s_event_slide.xml
deleted file mode 100644
index 7f145c917..000000000
--- a/theme_common/views/old_snippets/s_event_slide.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_event_slide_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_event_slide/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_features_carousel.xml b/theme_common/views/old_snippets/s_features_carousel.xml
deleted file mode 100644
index fbdedc030..000000000
--- a/theme_common/views/old_snippets/s_features_carousel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_features_carousel_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_features_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_features_carousel_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_features_carousel/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_full_menu.xml b/theme_common/views/old_snippets/s_full_menu.xml
deleted file mode 100644
index b54b3cefa..000000000
--- a/theme_common/views/old_snippets/s_full_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_full_menu_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_full_menu/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_header_text_big_picture.xml b/theme_common/views/old_snippets/s_header_text_big_picture.xml
deleted file mode 100644
index bb8948d7b..000000000
--- a/theme_common/views/old_snippets/s_header_text_big_picture.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_header_text_big_picture_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_header_text_big_picture/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_icon_box.xml b/theme_common/views/old_snippets/s_icon_box.xml
deleted file mode 100644
index 7b631b854..000000000
--- a/theme_common/views/old_snippets/s_icon_box.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_icon_box_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_icon_box/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_images_carousel.xml b/theme_common/views/old_snippets/s_images_carousel.xml
deleted file mode 100644
index 887ff903a..000000000
--- a/theme_common/views/old_snippets/s_images_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_images_carousel_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_images_carousel/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_images_row.xml b/theme_common/views/old_snippets/s_images_row.xml
deleted file mode 100644
index 370d047b3..000000000
--- a/theme_common/views/old_snippets/s_images_row.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_images_row_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_images_row/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_menu_three_columns.xml b/theme_common/views/old_snippets/s_menu_three_columns.xml
deleted file mode 100644
index 8054f7096..000000000
--- a/theme_common/views/old_snippets/s_menu_three_columns.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_menu_three_columns_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_menu_three_columns/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_mini_nav_bar.xml b/theme_common/views/old_snippets/s_mini_nav_bar.xml
deleted file mode 100644
index 12c5572e2..000000000
--- a/theme_common/views/old_snippets/s_mini_nav_bar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_mini_nav_bar_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_mini_nav_bar/000.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_mini_nav_bar_js_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/theme_common/static/src/old_snippets/s_mini_nav_bar/000.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_news_carousel.xml b/theme_common/views/old_snippets/s_news_carousel.xml
deleted file mode 100644
index e2a198ef5..000000000
--- a/theme_common/views/old_snippets/s_news_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_news_carousel_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_news_carousel/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_pricing.xml b/theme_common/views/old_snippets/s_pricing.xml
deleted file mode 100644
index 8d802d47a..000000000
--- a/theme_common/views/old_snippets/s_pricing.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_pricing_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_pricing/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_products_carousel.xml b/theme_common/views/old_snippets/s_products_carousel.xml
deleted file mode 100644
index bbe7255e5..000000000
--- a/theme_common/views/old_snippets/s_products_carousel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_products_carousel_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_products_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_products_carousel_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_products_carousel/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_profile.xml b/theme_common/views/old_snippets/s_profile.xml
deleted file mode 100644
index 9e8754319..000000000
--- a/theme_common/views/old_snippets/s_profile.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_profile_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_profile/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_progress.xml b/theme_common/views/old_snippets/s_progress.xml
deleted file mode 100644
index dd85b9d11..000000000
--- a/theme_common/views/old_snippets/s_progress.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_progress_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_progress/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_separator_nav.xml b/theme_common/views/old_snippets/s_separator_nav.xml
deleted file mode 100644
index 17dce60ec..000000000
--- a/theme_common/views/old_snippets/s_separator_nav.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_separator_nav_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_separator_nav/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_showcase_image.xml b/theme_common/views/old_snippets/s_showcase_image.xml
deleted file mode 100644
index 9d7c13e58..000000000
--- a/theme_common/views/old_snippets/s_showcase_image.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_showcase_image_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_showcase_image/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_showcase_image_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_showcase_image/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_showcase_slider.xml b/theme_common/views/old_snippets/s_showcase_slider.xml
deleted file mode 100644
index ef1c71920..000000000
--- a/theme_common/views/old_snippets/s_showcase_slider.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_showcase_slider_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_showcase_slider/000_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_showcase_slider_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_showcase_slider/000.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_snippet_s_showcase_slider_js_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/theme_common/static/src/old_snippets/s_showcase_slider/000.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_team_profiles.xml b/theme_common/views/old_snippets/s_team_profiles.xml
deleted file mode 100644
index 06e0aaa6f..000000000
--- a/theme_common/views/old_snippets/s_team_profiles.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_team_profiles_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_team_profiles/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_text_picture_text.xml b/theme_common/views/old_snippets/s_text_picture_text.xml
deleted file mode 100644
index b0eca9345..000000000
--- a/theme_common/views/old_snippets/s_text_picture_text.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_text_picture_text_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_text_picture_text/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/old_snippets/s_two_columns.xml b/theme_common/views/old_snippets/s_two_columns.xml
deleted file mode 100644
index ea9bbfbb4..000000000
--- a/theme_common/views/old_snippets/s_two_columns.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_two_columns_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/old_snippets/s_two_columns/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_common/views/theme_common_templates.xml b/theme_common/views/theme_common_templates.xml
deleted file mode 100644
index d5b283973..000000000
--- a/theme_common/views/theme_common_templates.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <!-- Those are independant from the user palette and act as default for it -->
-    <!-- Compatibility: Thoses templates are kept for now even though the -->
-    <!-- enabled palettes are now handled through a scss customization -->
-    <template id="option_colors_02_variables" inherit_id="theme_common._assets_primary_variables" active="False">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/options/colors/option_colors_02_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="option_colors_03_variables" inherit_id="theme_common._assets_primary_variables" active="False">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/options/colors/option_colors_03_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="option_colors_04_variables" inherit_id="theme_common._assets_primary_variables" active="False">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/options/colors/option_colors_04_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="option_colors_05_variables" inherit_id="theme_common._assets_primary_variables" active="False">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/options/colors/option_colors_05_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="option_colors_06_variables" inherit_id="theme_common._assets_primary_variables" active="False">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/options/colors/option_colors_06_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="option_colors_07_variables" inherit_id="theme_common._assets_primary_variables" active="False">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/options/colors/option_colors_07_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="option_colors_08_variables" inherit_id="theme_common._assets_primary_variables" active="False">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/options/colors/option_colors_08_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="option_colors_09_variables" inherit_id="theme_common._assets_primary_variables" active="False">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_common/static/src/scss/options/colors/option_colors_09_variables.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_enark/__manifest__.py b/theme_enark/__manifest__.py
index 85479437a..5593f5864 100644
--- a/theme_enark/__manifest__.py
+++ b/theme_enark/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/snippets_options.xml',
         'views/image_library.xml',
 
@@ -18,15 +18,16 @@
         'views/snippets/s_media_list.xml',
         'views/snippets/s_call_to_action.xml',
 
-        'views/old_snippets/s_big_icons.xml',
-        'views/old_snippets/s_big_image.xml',
-        'views/old_snippets/s_big_image_parallax.xml',
-        'views/old_snippets/s_icon_box.xml',
-    ],
+        ],
     'images': [
         'static/description/enark_description.jpg',
         'static/description/enark_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-enark.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_enark/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_enark/data/ir_asset.xml b/theme_enark/data/ir_asset.xml
new file mode 100644
index 000000000..a586d9007
--- /dev/null
+++ b/theme_enark/data/ir_asset.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_enark.s_big_image_parallax_000_scss" model="theme.ir.asset">
+            <field name="key">theme_enark.s_big_image_parallax_000_scss</field>
+            <field name="name">Big image parallax 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_enark/static/src/old_snippets/s_big_image_parallax/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_enark.s_big_image_000_scss" model="theme.ir.asset">
+            <field name="key">theme_enark.s_big_image_000_scss</field>
+            <field name="name">Big image 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_enark/static/src/old_snippets/s_big_image/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_enark.s_icon_box_000_scss" model="theme.ir.asset">
+            <field name="key">theme_enark.s_icon_box_000_scss</field>
+            <field name="name">Icon box 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_enark/static/src/old_snippets/s_icon_box/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_enark.s_big_icons_000_scss" model="theme.ir.asset">
+            <field name="key">theme_enark.s_big_icons_000_scss</field>
+            <field name="name">Big icons 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_enark/static/src/old_snippets/s_big_icons/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_enark.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_enark.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_enark/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_enark.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_enark.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_enark/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_enark/static/src/scss/primary_variables.scss b/theme_enark/static/src/scss/primary_variables.scss
index f9bb53b1d..d889a3a1a 100644
--- a/theme_enark/static/src/scss/primary_variables.scss
+++ b/theme_enark/static/src/scss/primary_variables.scss
@@ -27,125 +27,51 @@ $o-theme-bg-pattern-06: url("/theme_enark/static/src/img/backgrounds/bg_pattern_
 //------------------------------------------------------------------------------
 
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #9ea5ab,
-        'beta': #b5c0c9,
-        'gamma': #778089,
-        'delta': #566b7f,
-        'epsilon': #28354d,
-    ),
-    (
-        'alpha': #2b6990,
-        'beta': #9ea5ab,
-        'gamma': #1fb1b0,
-        'delta': #324465,
-        'epsilon': #28354d,
-    ),
-    (
-        'alpha': #5a8eaf,
-        'beta': #2b6990,
-        'gamma': #566b7f,
-        'delta': #324465,
-        'epsilon': #28354d,
-    ),
-    (
-        'alpha': #1fb1b0,
-        'beta': #566b7f,
-        'gamma': #1b7f7e,
-        'delta': darken(#1b7f7e, 30%),
-        'epsilon': darken(#1b7f7e, 50%),
-    ),
-    (
-        'alpha': #5a8eaf,
-        'beta': #2b6990,
-        'gamma': #1fb1b0,
-        'delta': #324465,
-        'epsilon': #28354d,
-    ),
-    (
-        'alpha': lighten(#000, 45%),
-        'beta': lighten(#000, 80%),
-        'gamma': lighten(#000, 70%),
-        'delta': lighten(#000, 35%),
-        'epsilon': lighten(#000, 20%),
-    ),
-);
-
-// Grays
-$-gray-700: lighten(#000, 55%);
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000, 40%),
-        '700': $-gray-700,
-        '600': lighten(#000, 70%),
-        '200': lighten(#000, 80%),
-    ));
-}
-
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #7b97af,
-        'o-color-2': #464d53,
-        'o-color-3': #f2f2f2,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #191919,
-
-        'o-cc1-text': 'o-color-2',
-        'o-cc1-btn-primary': 'o-color-2',
-        'o-cc5-link': 'o-color-4',
-    ),
-    (
-        'o-color-1': #41cb7a,
-        'o-color-2': #0f4c26,
-        'o-color-3': #fafafa,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #F2A679,
-        'o-color-2': #4f6b8c,
-        'o-color-3': #f4f2f2,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'o-cc4-text': 'o-color-5',
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #FFC513,
-        'o-color-2': #022859,
-        'o-color-3': #f4f2f2,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'o-cc4-text': 'o-color-5',
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #41cbb4,
-        'o-color-2': #0f4c4c,
-        'o-color-3': #f2f2ef,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #000000,
-
-        'o-cc4-text': 'o-color-5',
-
-        'footer': 4,
-        'copyright': 4,
-    ),
+        'enark-1': (
+            'alpha': #9ea5ab,
+            'beta': #b5c0c9,
+            'gamma': #778089,
+            'delta': #566b7f,
+            'epsilon': #28354d,
+        ),
+        'enark-2': (
+            'alpha': #2b6990,
+            'beta': #9ea5ab,
+            'gamma': #1fb1b0,
+            'delta': #324465,
+            'epsilon': #28354d,
+        ),
+        'enark-3': (
+            'alpha': #5a8eaf,
+            'beta': #2b6990,
+            'gamma': #566b7f,
+            'delta': #324465,
+            'epsilon': #28354d,
+        ),
+        'enark-4': (
+            'alpha': #1fb1b0,
+            'beta': #566b7f,
+            'gamma': #1b7f7e,
+            'delta': darken(#1b7f7e, 30%),
+            'epsilon': darken(#1b7f7e, 50%),
+        ),
+        'enark-5': (
+            'alpha': #5a8eaf,
+            'beta': #2b6990,
+            'gamma': #1fb1b0,
+            'delta': #324465,
+            'epsilon': #28354d,
+        ),
+        'enark-6': (
+            'alpha': lighten(#000, 45%),
+            'beta': lighten(#000, 80%),
+            'gamma': lighten(#000, 70%),
+            'delta': lighten(#000, 35%),
+            'epsilon': lighten(#000, 20%),
+        ),
+    )
 );
 
 //------------------------------------------------------------------------------
@@ -212,6 +138,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'enark-1',
         'header-font-size': 1.3rem,
         'font': 'Raleway',
         'headings-font': 'Abel',
@@ -223,3 +150,39 @@ $o-website-values-palettes: (
         'btn-primary-outline': 'true',
     ),
 );
+
+$o-palette-priority-prefix: 'enark';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'enark-1',
+    2: 'enark-2',
+    3: 'enark-3',
+    4: 'enark-4',
+    5: 'enark-5',
+    6: 'generic-1',
+    7: 'generic-2',
+    8: 'generic-3',
+    9: 'generic-4',
+    10: 'generic-5',
+    11: 'generic-6',
+    12: 'generic-7',
+    13: 'generic-8',
+    14: 'generic-9',
+    15: 'generic-10',
+    16: 'generic-11',
+    17: 'generic-12',
+    18: 'generic-13',
+    19: 'generic-14',
+    20: 'generic-15',
+    21: 'generic-16',
+    22: 'generic-17',
+);
+
+$o-theme-color-palettes-compatibility-indexes: (
+    1: 'enark-1',
+    2: 'enark-2',
+    3: 'enark-3',
+    4: 'enark-4',
+    5: 'enark-5',
+    6: 'enark-6',
+);
diff --git a/theme_enark/views/assets.xml b/theme_enark/views/assets.xml
deleted file mode 100644
index d3a8e0818..000000000
--- a/theme_enark/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_enark/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_enark/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_enark/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_enark/views/old_snippets/s_big_icons.xml b/theme_enark/views/old_snippets/s_big_icons.xml
deleted file mode 100644
index c16a9ddd7..000000000
--- a/theme_enark/views/old_snippets/s_big_icons.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_big_icons_css_000" inherit_id="theme_common.assets_snippet_s_big_icons_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_enark/static/src/old_snippets/s_big_icons/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_enark/views/old_snippets/s_big_image.xml b/theme_enark/views/old_snippets/s_big_image.xml
deleted file mode 100644
index 172b7572f..000000000
--- a/theme_enark/views/old_snippets/s_big_image.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_big_image_css_000" inherit_id="theme_common.assets_snippet_s_big_image_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_enark/static/src/old_snippets/s_big_image/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_enark/views/old_snippets/s_big_image_parallax.xml b/theme_enark/views/old_snippets/s_big_image_parallax.xml
deleted file mode 100644
index 9a695e677..000000000
--- a/theme_enark/views/old_snippets/s_big_image_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_big_image_parallax_css_000" inherit_id="theme_common.assets_snippet_s_big_image_parallax_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_enark/static/src/old_snippets/s_big_image_parallax/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_enark/views/old_snippets/s_icon_box.xml b/theme_enark/views/old_snippets/s_icon_box.xml
deleted file mode 100644
index c1504519e..000000000
--- a/theme_enark/views/old_snippets/s_icon_box.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_icon_box_css_000" inherit_id="theme_common.assets_snippet_s_icon_box_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_enark/static/src/old_snippets/s_icon_box/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_graphene/__manifest__.py b/theme_graphene/__manifest__.py
index 936a310f5..ea29f918e 100644
--- a/theme_graphene/__manifest__.py
+++ b/theme_graphene/__manifest__.py
@@ -7,17 +7,21 @@
     'version': '2.0.0',
     'author': 'Odoo S.A.',
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_library.xml',
         'views/customizations.xml',
 
-        'views/old_snippets/s_showcase_slider.xml',
-    ],
+        ],
     'images': [
         'static/description/graphene_poster.jpg',
         'static/description/graphene_screenshot.jpg',
     ],
     'depends': ['theme_common', 'website_animate'],
     'license': 'LGPL-3',
-    'live_test_url': 'https://theme-graphene.odoo.com'
+    'live_test_url': 'https://theme-graphene.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_graphene/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_graphene/data/ir_asset.xml b/theme_graphene/data/ir_asset.xml
new file mode 100644
index 000000000..5ed96a463
--- /dev/null
+++ b/theme_graphene/data/ir_asset.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_graphene.s_showcase_slider_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_graphene.s_showcase_slider_000_variables_scss</field>
+            <field name="name">Showcase slider 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_graphene/static/src/old_snippets/s_showcase_slider/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_graphene.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_graphene.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="directive">append</field>
+            <field name="glob">theme_graphene/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_graphene.secondary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_graphene.secondary_variables_scss</field>
+            <field name="name">Secondary variables SCSS</field>
+            <field name="bundle">web._assets_secondary_variables</field>
+            <field name="glob">theme_graphene/static/src/scss/secondary_variables.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_graphene/models/theme_graphene.py b/theme_graphene/models/theme_graphene.py
index 6d5d16ff5..2ff4766ac 100644
--- a/theme_graphene/models/theme_graphene.py
+++ b/theme_graphene/models/theme_graphene.py
@@ -6,7 +6,7 @@ class ThemeGraphene(models.AbstractModel):
 
     def _theme_graphene_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-2')
+        # self.enable_asset('theme_common.compatibility_saas_10_2')
 
         self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_centered_logo')
@@ -15,4 +15,5 @@ class ThemeGraphene(models.AbstractModel):
         self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_centered')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
diff --git a/theme_graphene/static/src/scss/primary_variables.scss b/theme_graphene/static/src/scss/primary_variables.scss
index 2a667f347..b72b3c7a0 100644
--- a/theme_graphene/static/src/scss/primary_variables.scss
+++ b/theme_graphene/static/src/scss/primary_variables.scss
@@ -4,124 +4,54 @@
 //------------------------------------------------------------------------------
 
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #85AFA8,
-        'beta': #7E566B,
-        'gamma': #85909A,
-        'delta': #969397,
-        'epsilon': #422335,
+        'graphene-1': (
+            'alpha': #85AFA8,
+            'beta': #7E566B,
+            'gamma': #85909A,
+            'delta': #969397,
+            'epsilon': #422335,
 
-        'success': #1b8433,
-        'warning': #e4b013,
-    ),
-    (
-        'alpha': #54787D,
-        'beta': #6B9997,
-        'gamma': #615145,
-        'delta': #C6CCA5,
-        'epsilon': #412342,
+            'success': #1b8433,
+            'warning': #e4b013,
+        ),
+        'graphene-2': (
+            'alpha': #54787D,
+            'beta': #6B9997,
+            'gamma': #615145,
+            'delta': #C6CCA5,
+            'epsilon': #412342,
 
-        'success': #5CB85C,
-        'info': #4D68A3,
-        'warning': #DDC66B,
-        'danger': #D86060,
-    ),
-    (
-        'alpha': #456F74,
-        'beta': #EB5937,
-        'gamma': #403D3C,
-        'delta': #1C1919,
-        'epsilon': #D3CBBD,
+            'success': #5CB85C,
+            'info': #4D68A3,
+            'warning': #DDC66B,
+            'danger': #D86060,
+        ),
+        'graphene-3': (
+            'alpha': #456F74,
+            'beta': #EB5937,
+            'gamma': #403D3C,
+            'delta': #1C1919,
+            'epsilon': #D3CBBD,
 
-        'success': #31B05E,
-        'info': #4D68A3,
-        'warning': #EACF41,
-        'danger': #CB3E3E,
-    ),
-    (
-        'alpha': #23C59E,
-        'beta': #FF5B5B,
-        'gamma': #FFE9C7,
-        'delta': #545445,
-        'epsilon': #2D2D36,
+            'success': #31B05E,
+            'info': #4D68A3,
+            'warning': #EACF41,
+            'danger': #CB3E3E,
+        ),
+        'graphene-4': (
+            'alpha': #23C59E,
+            'beta': #FF5B5B,
+            'gamma': #FFE9C7,
+            'delta': #545445,
+            'epsilon': #2D2D36,
 
-        'success': #5CB85C,
-    ),
+            'success': #5CB85C,
+        ),
+    )
 );
 
-// Theme Palettes
-$o-color-palettes: (
-    (   // Palette 1
-        'o-color-1': #30cbb2,
-        'o-color-2': #3c4e5e,
-        'o-color-3': #f4f5f6,
-        'o-color-4': #ffffff,
-        'o-color-5': #192028,
-
-        'o-cc1-link': #04957e,
-        'o-cc5-text': #b2b2b2,
-
-        'body': 'black-15',
-        'menu': 1,
-        'footer': 5,
-        'copyright': 'black-25',
-    ),
-    (   // Palette 2
-        'o-color-1': #c8a47e,
-        'o-color-2': #32273b,
-        'o-color-3': #f1f1ef,
-        'o-color-4': #ffffff,
-        'o-color-5': #252424,
-
-        'o-cc3-text': #b2b2b2,
-        'o-cc4-text': 'o-color-4',
-        'o-cc3-headings': 'o-color-4',
-        'o-cc4-headings': 'o-color-5',
-        'o-cc5-text': #b2b2b2,
-    ),
-    (   // Palette 3
-        'o-color-1': #39588e,
-        'o-color-2': #d2b683,
-        'o-color-3': #e0dfdb,
-        'o-color-4': #f4f5f6,
-        'o-color-5': #2a282a,
-
-        'o-cc5-link': #7a9edc,
-
-        'menu': 2,
-        'footer': 2,
-    ),
-    (   // Palette 4
-        'o-color-1': #f48747,
-        'o-color-2': #e9ceb0,
-        'o-color-3': #f1ebe5,
-        'o-color-4': #fbfaf8,
-        'o-color-5': #282d30,
-
-        'menu': 5,
-    ),
-);
-
-// Grays
-$-black: #000000;
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '975': lighten($-black, 13%),
-        '950': lighten($-black, 16%),
-        '925': lighten($-black, 19%),
-        '900': lighten($-black, 22%),
-        '800': lighten($-black, 25%),
-        '700': lighten($-black, 33.5%),
-        '650': lighten($-black, 50%),
-        '600': lighten($-black, 65.5%),
-        '400': lighten($-black, 82%),
-        '200': lighten($-black, 93.5%),
-    ));
-}
-
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -163,6 +93,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'graphene-1',
+
         'font-size-base': 1rem,
         'headings-font': 'Source Sans Pro',
         'btn-ripple': true,
@@ -177,3 +109,29 @@ $o-website-values-palettes: (
         'btn-border-radius-lg': 2px,
     ),
 );
+
+$o-palette-priority-prefix: 'graphene';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'graphene-1',
+    2: 'graphene-2',
+    3: 'graphene-3',
+    4: 'graphene-4',
+    5: 'generic-1',
+    6: 'generic-2',
+    7: 'generic-3',
+    8: 'generic-4',
+    9: 'generic-5',
+    10: 'generic-6',
+    11: 'generic-7',
+    12: 'generic-8',
+    13: 'generic-9',
+    14: 'generic-10',
+    15: 'generic-11',
+    16: 'generic-12',
+    17: 'generic-13',
+    18: 'generic-14',
+    19: 'generic-15',
+    20: 'generic-16',
+    21: 'generic-17',
+);
diff --git a/theme_graphene/static/src/scss/secondary_variables.scss b/theme_graphene/static/src/scss/secondary_variables.scss
index 5127ecf50..047cfac99 100644
--- a/theme_graphene/static/src/scss/secondary_variables.scss
+++ b/theme_graphene/static/src/scss/secondary_variables.scss
@@ -3,7 +3,7 @@
 $-palettes: $o-theme-color-palettes;
 $o-theme-color-palettes: ();
 $-variations: ('lighter': 10%, 'light': 5%, 'dark': -5%, 'darker': -10%);
-@each $-palette in $-palettes {
-    $o-theme-color-palettes: append($o-theme-color-palettes, o-theme-common-add-color-variations($-palette, $-palette, $-variations));
+@each $key, $-palette in $-palettes {
+    $o-theme-color-palettes: map-merge($o-theme-color-palettes, ($key: o-theme-common-add-color-variations($-palette, $-palette, $-variations)));
 }
 $o-user-theme-color-palette: o-theme-common-add-color-variations($o-user-theme-color-palette, $o-user-theme-color-palette, $-variations);
diff --git a/theme_graphene/views/assets.xml b/theme_graphene/views/assets.xml
deleted file mode 100644
index f6c04d2c3..000000000
--- a/theme_graphene/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_graphene/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_secondary_variables" inherit_id="website._assets_secondary_variables" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_graphene/static/src/scss/secondary_variables.scss"/>
-        </xpath>
-    </template>
-
-    <!-- Onboarding Tour -->
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_graphene/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_graphene/views/old_snippets/s_showcase_slider.xml b/theme_graphene/views/old_snippets/s_showcase_slider.xml
deleted file mode 100644
index a999ba466..000000000
--- a/theme_graphene/views/old_snippets/s_showcase_slider.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_showcase_slider_css_000_variables" inherit_id="theme_common._assets_snippet_s_showcase_slider_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_graphene/static/src/old_snippets/s_showcase_slider/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_kea/__manifest__.py b/theme_kea/__manifest__.py
index 85f822e50..65390b2f4 100644
--- a/theme_kea/__manifest__.py
+++ b/theme_kea/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_content.xml',
 
         'views/snippets/s_cover.xml',
@@ -18,13 +18,16 @@
         'views/snippets/s_media_list.xml',
         'views/snippets/s_references.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-        'views/old_snippets/s_features_carousel.xml',
-    ],
+        ],
     'images': [
         'static/description/kea_description.png',
         'static/description/kea_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-kea.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_kea/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_kea/data/ir_asset.xml b/theme_kea/data/ir_asset.xml
new file mode 100644
index 000000000..ee2c71f38
--- /dev/null
+++ b/theme_kea/data/ir_asset.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_kea.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_kea.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_kea/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_kea.s_features_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_kea.s_features_carousel_000_variables_scss</field>
+            <field name="name">Features carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_kea/static/src/old_snippets/s_features_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_kea.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_kea.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_kea/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_kea.secondary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_kea.secondary_variables_scss</field>
+            <field name="name">Secondary variables SCSS</field>
+            <field name="bundle">web._assets_secondary_variables</field>
+            <field name="glob">theme_kea/static/src/scss/secondary_variables.scss</field>
+        </record>
+
+        <record id="theme_kea.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_kea.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_kea/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+        <record id="theme_kea.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_kea.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_kea/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_kea/models/theme_kea.py b/theme_kea/models/theme_kea.py
index ce1fd667a..153f83f55 100644
--- a/theme_kea/models/theme_kea.py
+++ b/theme_kea/models/theme_kea.py
@@ -9,4 +9,4 @@ class ThemeKea(models.AbstractModel):
         self.enable_view('website.template_footer_call_to_action')
 
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-1')
+        # self.enable_asset('theme_common.compatibility_saas_10_1')
diff --git a/theme_kea/static/src/scss/primary_variables.scss b/theme_kea/static/src/scss/primary_variables.scss
index 8b77b14d1..b181c536a 100644
--- a/theme_kea/static/src/scss/primary_variables.scss
+++ b/theme_kea/static/src/scss/primary_variables.scss
@@ -10,113 +10,51 @@
 // this only applied to buttons though but we extended that to all components.
 // Success, info, warning and error buttons are also customized with epsilon,
 // gamma, delta and ... black colors (see theme.scss).
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        alpha: #ffffff,
-        beta: #dcdcdc,
-        gamma: #9c9b9b,
-        delta: #333333,
-        epsilon: #e4677f,
-    ),
-    (
-        alpha: #c7d0d5,
-        beta: #93b1c6,
-        gamma: #ffffff,
-        delta: #556672,
-        epsilon: #ff7148,
-    ),
-    (
-        alpha: #ebe3e0,
-        beta: #e3d6c6,
-        gamma: #ffffff,
-        delta: #333333,
-        epsilon: #f9a646,
-    ),
-    (
-        alpha: #7ec2aa,
-        beta: #4ca8a1,
-        gamma: #ffffff,
-        delta: #556672,
-        epsilon: #f9a646,
-    ),
-    (
-        alpha: #7f909a,
-        beta: #ed6639,
-        gamma: #ffffff,
-        delta: #333333,
-        epsilon: #385b9f,
-    ),
-    (
-        alpha: #fcdf15,
-        beta: #0b99bc,
-        gamma: #ffffff,
-        delta: #3c3c3c,
-        epsilon: #d40e52,
-    ),
-);
-
-// Grays
-$-gray-700: lighten(#000, 33.5%);
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000, 20%),
-        '700': $-gray-700,
-        '600': lighten(#000, 46.7%),
-        '300': #d4d4d4,
-        '200': lighten(#000, 85%),
-    ));
-}
-
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #e991a3,
-        'o-color-2': #575757,
-        'o-color-3': #f6f5f5,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #f7a58e,
-        'o-color-2': #4b6272,
-        'o-color-3': #ecf0f2,
-        'o-color-4': #ffffff,
-        'o-color-5': #374249,
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #f9a646,
-        'o-color-2': #68635d,
-        'o-color-3': #f0efee,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #ed6639,
-        'o-color-2': #385b9f,
-        'o-color-3': #d5dee3,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'o-cc4-link': 'o-color-4',
-        'o-cc4-btn-primary': 'o-color-4',
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
+        'kea-1': (
+            alpha: #ffffff,
+            beta: #dcdcdc,
+            gamma: #9c9b9b,
+            delta: #333333,
+            epsilon: #e4677f,
+        ),
+        'kea-2': (
+            alpha: #c7d0d5,
+            beta: #93b1c6,
+            gamma: #ffffff,
+            delta: #556672,
+            epsilon: #ff7148,
+        ),
+        'kea-3': (
+            alpha: #ebe3e0,
+            beta: #e3d6c6,
+            gamma: #ffffff,
+            delta: #333333,
+            epsilon: #f9a646,
+        ),
+        'kea-4': (
+            alpha: #7ec2aa,
+            beta: #4ca8a1,
+            gamma: #ffffff,
+            delta: #556672,
+            epsilon: #f9a646,
+        ),
+        'kea-5': (
+            alpha: #7f909a,
+            beta: #ed6639,
+            gamma: #ffffff,
+            delta: #333333,
+            epsilon: #385b9f,
+        ),
+        'kea-6': (
+            alpha: #fcdf15,
+            beta: #0b99bc,
+            gamma: #ffffff,
+            delta: #3c3c3c,
+            epsilon: #d40e52,
+        ),
+    )
 );
 
 //------------------------------------------------------------------------------
@@ -171,6 +109,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'kea-1',
+
         'header-font-size': 1.25rem,
         'logo-height': 3rem,
         'fixed-logo-height': 3rem,
@@ -186,3 +126,38 @@ $o-website-values-palettes: (
         'footer-template': 'call_to_action',
     ),
 );
+
+$o-palette-priority-prefix: 'kea';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'kea-1',
+    2: 'kea-2',
+    3: 'kea-3',
+    4: 'kea-4',
+    5: 'generic-1',
+    6: 'generic-2',
+    7: 'generic-3',
+    8: 'generic-4',
+    9: 'generic-5',
+    10: 'generic-6',
+    11: 'generic-7',
+    12: 'generic-8',
+    13: 'generic-9',
+    14: 'generic-10',
+    15: 'generic-11',
+    16: 'generic-12',
+    17: 'generic-13',
+    18: 'generic-14',
+    19: 'generic-15',
+    20: 'generic-16',
+    21: 'generic-17',
+);
+
+$o-theme-color-palettes-compatibility-indexes: (
+    1: 'kea-1',
+    2: 'kea-2',
+    3: 'kea-3',
+    4: 'kea-4',
+    5: 'kea-5',
+    6: 'kea-6',
+);
diff --git a/theme_kea/views/assets.xml b/theme_kea/views/assets.xml
deleted file mode 100644
index 28179075e..000000000
--- a/theme_kea/views/assets.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_kea/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_secondary_variables" inherit_id="website._assets_secondary_variables" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_kea/static/src/scss/secondary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_kea/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_kea/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_kea/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_kea/views/old_snippets/s_banner_parallax.xml b/theme_kea/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index a51a7393d..000000000
--- a/theme_kea/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_kea/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_kea/views/old_snippets/s_features_carousel.xml b/theme_kea/views/old_snippets/s_features_carousel.xml
deleted file mode 100644
index 2006e04f4..000000000
--- a/theme_kea/views/old_snippets/s_features_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_features_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_features_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_kea/static/src/old_snippets/s_features_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_kiddo/__manifest__.py b/theme_kiddo/__manifest__.py
index 1b4ae366c..ade2be34b 100644
--- a/theme_kiddo/__manifest__.py
+++ b/theme_kiddo/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_library.xml',
 
         'views/snippets/s_banner.xml',
@@ -17,12 +17,16 @@
         'views/snippets/s_three_columns.xml',
         'views/snippets/s_call_to_action.xml',
 
-        'views/old_snippets/s_discount.xml',
-    ],
+        ],
     'images': [
         'static/description/Kiddo_description.png',
         'static/description/kiddo_screenshot.jpg',
     ],
     'license': 'LGPL-3',
-    'live_test_url': 'https://theme-kiddo.odoo.com'
+    'live_test_url': 'https://theme-kiddo.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_kiddo/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_kiddo/data/ir_asset.xml b/theme_kiddo/data/ir_asset.xml
new file mode 100644
index 000000000..62e090df7
--- /dev/null
+++ b/theme_kiddo/data/ir_asset.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_kiddo.s_discount_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_kiddo.s_discount_000_variables_scss</field>
+            <field name="name">Discount 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_kiddo/static/src/old_snippets/s_discount/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_kiddo.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_kiddo.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_kiddo/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_kiddo.secondary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_kiddo.secondary_variables_scss</field>
+            <field name="name">Secondary variables SCSS</field>
+            <field name="bundle">web._assets_secondary_variables</field>
+            <field name="glob">theme_kiddo/static/src/scss/secondary_variables.scss</field>
+        </record>
+
+        <record id="theme_kiddo.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_kiddo.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_kiddo/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_kiddo/models/theme_kiddo.py b/theme_kiddo/models/theme_kiddo.py
index 82dfecace..272dc433f 100644
--- a/theme_kiddo/models/theme_kiddo.py
+++ b/theme_kiddo/models/theme_kiddo.py
@@ -12,4 +12,4 @@ class ThemeKiddo(models.AbstractModel):
         self.enable_view('website.template_footer_minimalist')
 
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-1')
+        # self.enable_asset('theme_common.compatibility_saas_10_1')
diff --git a/theme_kiddo/static/description/kiddo_screenshot.jpg b/theme_kiddo/static/description/kiddo_screenshot.jpg
index 0203cbdd8..22113fe89 100644
Binary files a/theme_kiddo/static/description/kiddo_screenshot.jpg and b/theme_kiddo/static/description/kiddo_screenshot.jpg differ
diff --git a/theme_kiddo/static/src/scss/primary_variables.scss b/theme_kiddo/static/src/scss/primary_variables.scss
index 7b7f727b8..0eec76a24 100644
--- a/theme_kiddo/static/src/scss/primary_variables.scss
+++ b/theme_kiddo/static/src/scss/primary_variables.scss
@@ -3,111 +3,53 @@
 //------------------------------------------------------------------------------
 
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #ffffff,
-        'beta': #47464b,
-        'gamma': #f3997b,
-        'delta': #add3ce,
-        'epsilon': #a7c7d5,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #d699ae,
-        'gamma': #B24774,
-        'delta': #72c2d0,
-        'epsilon': #ed8354,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #79CCC2,
-        'gamma': #F05A12,
-        'delta': #C5FFF8,
-        'epsilon': #0F7F72,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #53a1cc,
-        'gamma': #116899,
-        'delta': #aab3ca,
-        'epsilon': #ffc9c1,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #3b2c3c,
-        'gamma': #D2546D,
-        'delta': #303347,
-        'epsilon': #171827,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #2F343B,
-        'gamma': #C77966,
-        'delta': #703030,
-        'epsilon': #E3CDA4,
-    ),
+        'kiddo-1': (
+            'alpha': #ffffff,
+            'beta': #47464b,
+            'gamma': #f3997b,
+            'delta': #add3ce,
+            'epsilon': #a7c7d5,
+        ),
+        'kiddo-2': (
+            'alpha': #ffffff,
+            'beta': #d699ae,
+            'gamma': #B24774,
+            'delta': #72c2d0,
+            'epsilon': #ed8354,
+        ),
+        'kiddo-3': (
+            'alpha': #ffffff,
+            'beta': #79CCC2,
+            'gamma': #F05A12,
+            'delta': #C5FFF8,
+            'epsilon': #0F7F72,
+        ),
+        'kiddo-4': (
+            'alpha': #ffffff,
+            'beta': #53a1cc,
+            'gamma': #116899,
+            'delta': #aab3ca,
+            'epsilon': #ffc9c1,
+        ),
+        'kiddo-5': (
+            'alpha': #ffffff,
+            'beta': #3b2c3c,
+            'gamma': #D2546D,
+            'delta': #303347,
+            'epsilon': #171827,
+        ),
+        'kiddo-6': (
+            'alpha': #ffffff,
+            'beta': #2F343B,
+            'gamma': #C77966,
+            'delta': #703030,
+            'epsilon': #E3CDA4,
+        ),
+    )
 );
 
-$o-color-palettes: (
-    (
-        'o-color-1': #f3997b,
-        'o-color-2': #99869e,
-        'o-color-3': #e3f0ee,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #2c2927,
-
-        'o-cc2-headings': null,
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #637bbe,
-        'o-color-2': #8eb9c7,
-        'o-color-3': #f6f0ea,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #343643,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #684672,
-        'o-color-2': #6ea29c,
-        'o-color-3': #f8ebd6,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #302633,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #c54545,
-        'o-color-2': #364481,
-        'o-color-3': #ccd7c5,
-        'o-color-4': #ffffff,
-        'o-color-5': #1f2230,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-);
-
-// Grays
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000, 20%),
-        '700': lighten(#000, 33.5%),
-        '600': lighten(#000, 46.7%),
-        '200': lighten(#000, 85%),
-    ));
-}
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -176,12 +118,16 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
-        'font-size-base': (14 / 16) * 1rem,
+        'color-palettes-name': 'kiddo-1',
+
+        'font-size-base': (14 / 16) * 1.075rem,
         'header-font-size': 1.25rem,
         'logo-height': 3rem,
         'fixed-logo-height': 3rem,
         'btn-border-radius': 2rem,
-        'font': 'MontSerrat',
+        'btn-padding-y': .75rem,
+        'btn-padding-x': 1.75rem,
+        'font': 'Montserrat',
         'headings-font': 'Bubblegum Sans',
         'navbar-font': 'Bubblegum Sans',
         'buttons-font': 'Bubblegum Sans',
@@ -190,3 +136,38 @@ $o-website-values-palettes: (
         'footer-template': 'minimalist',
     ),
 );
+
+$o-palette-priority-prefix: 'kiddo';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'kiddo-1',
+    2: 'kiddo-2',
+    3: 'kiddo-3',
+    4: 'kiddo-4',
+    5: 'generic-1',
+    6: 'generic-2',
+    7: 'generic-3',
+    8: 'generic-4',
+    9: 'generic-5',
+    10: 'generic-6',
+    11: 'generic-7',
+    12: 'generic-8',
+    13: 'generic-9',
+    14: 'generic-10',
+    15: 'generic-11',
+    16: 'generic-12',
+    17: 'generic-13',
+    18: 'generic-14',
+    19: 'generic-15',
+    20: 'generic-16',
+    21: 'generic-17',
+);
+
+$o-gray-color-palettes-compatibility-indexes: (
+    1: 'kiddo-1',
+    2: 'kiddo-2',
+    3: 'kiddo-3',
+    4: 'kiddo-4',
+    5: 'kiddo-5',
+    6: 'kiddo-6',
+);
diff --git a/theme_kiddo/views/assets.xml b/theme_kiddo/views/assets.xml
deleted file mode 100644
index bd8c4d648..000000000
--- a/theme_kiddo/views/assets.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_kiddo/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_secondary_variables" inherit_id="website._assets_secondary_variables" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_kiddo/static/src/scss/secondary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_kiddo/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_kiddo/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_kiddo/views/old_snippets/s_discount.xml b/theme_kiddo/views/old_snippets/s_discount.xml
deleted file mode 100644
index 91521d9ef..000000000
--- a/theme_kiddo/views/old_snippets/s_discount.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_discount_css_000_variables" inherit_id="theme_common._assets_snippet_s_discount_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_kiddo/static/src/old_snippets/s_discount/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_kiddo/views/snippets/s_image_text.xml b/theme_kiddo/views/snippets/s_image_text.xml
index fcff23930..806369b0b 100644
--- a/theme_kiddo/views/snippets/s_image_text.xml
+++ b/theme_kiddo/views/snippets/s_image_text.xml
@@ -10,10 +10,18 @@
         <xpath expr="//div[hasclass('container')]" position="before">
             <div class="o_we_shape o_web_editor_Wavy_13 o_we_flip_x" style='background-image: url("/web_editor/shape/web_editor/Wavy/13.svg?c4=%2399869E");'/>
         </xpath>
-        <!-- Paragraph -->
-        <xpath expr="(//div[hasclass('col-lg-6')])[2]" position="replace">
-            <div class="p-5 col-lg-5 offset-lg-1 o_cc o_cc3 text-center pb120 pt120 rounded shadow border" style="border-color: rgb(44, 41, 39) !important; border-radius: 300px !important; border-width: 2px !important; box-shadow: rgb(44, 41, 39) 25px 25px 0px 0px !important;">
-                <h2>Activities</h2>
+        <!-- Image -->
+        <xpath expr="//img" position="attributes">
+            <attribute name="src" add="/web_editor/shape/illustration/baby-svg-561?c1=%23F3997B&amp;unique=45e7f0c7" remove="/web/image/website.s_image_text_default_image" separator=" "/>
+        </xpath>
+        <!-- Paragraph 1 -->
+        <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+            <attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
+        </xpath>
+        <!-- Paragraph 2 -->
+        <xpath expr="//div[hasclass('col-lg-6')]" position="replace">
+            <div class="p-5 col-lg-6 offset-lg-1 o_cc o_cc3 text-center pb120 pt120 rounded shadow border" style="border-color: rgb(44, 41, 39) !important; border-radius: 300px !important; border-width: 2px !important; box-shadow: rgb(44, 41, 39) 15px 15px 0px 0px !important;">
+                <h2 style="font-size: 48px;">Activities</h2>
                 <p><br/></p>
                 <p>Our team is composed of experienced nursery nurses.</p>
                 <p>They will propose to your children educational activities, playful, varied and adapted to the stage of development.</p>
diff --git a/theme_loftspace/__manifest__.py b/theme_loftspace/__manifest__.py
index 717a1fcd0..fdc226f6e 100644
--- a/theme_loftspace/__manifest__.py
+++ b/theme_loftspace/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_content.xml',
 
         'views/snippets/s_cover.xml',
@@ -18,14 +18,16 @@
         'views/snippets/s_three_columns.xml',
         'views/snippets/s_call_to_action.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-        'views/old_snippets/s_features_carousel.xml',
-        'views/old_snippets/s_products_carousel.xml'
-    ],
+        ],
     'images': [
         'static/description/loftspace_description.png',
         'static/description/loftspace_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-loftspace.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_loftspace/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_loftspace/data/ir_asset.xml b/theme_loftspace/data/ir_asset.xml
new file mode 100644
index 000000000..6a39d3966
--- /dev/null
+++ b/theme_loftspace/data/ir_asset.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_loftspace.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_loftspace.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_loftspace/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_loftspace.s_features_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_loftspace.s_features_carousel_000_variables_scss</field>
+            <field name="name">Features carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_loftspace/static/src/old_snippets/s_features_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_loftspace.s_products_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_loftspace.s_products_carousel_000_variables_scss</field>
+            <field name="name">Products carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_loftspace/static/src/old_snippets/s_products_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_loftspace.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_loftspace.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_loftspace/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_loftspace.secondary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_loftspace.secondary_variables_scss</field>
+            <field name="name">Secondary variables SCSS</field>
+            <field name="bundle">web._assets_secondary_variables</field>
+            <field name="glob">theme_loftspace/static/src/scss/secondary_variables.scss</field>
+        </record>
+
+        <record id="theme_loftspace.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_loftspace.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_loftspace/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+        <record id="theme_loftspace.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_loftspace.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_loftspace/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_loftspace/models/theme_loftspace.py b/theme_loftspace/models/theme_loftspace.py
index 04144a547..954eec5d4 100644
--- a/theme_loftspace/models/theme_loftspace.py
+++ b/theme_loftspace/models/theme_loftspace.py
@@ -6,5 +6,5 @@ class ThemeLoftspace(models.AbstractModel):
 
     def _theme_loftspace_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-1')
+        # self.enable_asset('theme_common.compatibility_saas_10_1')
         pass
diff --git a/theme_loftspace/static/src/scss/primary_variables.scss b/theme_loftspace/static/src/scss/primary_variables.scss
index 23afb77c4..a8ceb5842 100644
--- a/theme_loftspace/static/src/scss/primary_variables.scss
+++ b/theme_loftspace/static/src/scss/primary_variables.scss
@@ -20,132 +20,51 @@ $bg-img-07: url("/web/image/theme_common.image_content_07");
 // this only applied to buttons though but we extended that to all components.
 // Success, info, warning and error buttons are also customized with epsilon,
 // gamma, delta and ... black colors (see theme.scss).
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #ffffff,
-        'beta': #cdd0a2,
-        'gamma': #b4bbb9,
-        'delta': #242327,
-        'epsilon': #957985,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #e9e9e9,
-        'gamma': #c8efeb,
-        'delta': #1e222f,
-        'epsilon': #55e8da,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #dbe8ed,
-        'gamma': #ecd5d6,
-        'delta': #590046,
-        'epsilon': #df699c,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #d3d3d3,
-        'gamma': #f2ef1a,
-        'delta': #000000,
-        'epsilon': #f1aa6b,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #cfcfcf,
-        'gamma': #2e2e2e,
-        'delta': #000000,
-        'epsilon': #1ad68f,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #9fcae2,
-        'gamma': #bbc05c,
-        'delta': #112625,
-        'epsilon': #45b08c,
-    ),
-);
-
-// Grays
-$-gray-700: lighten(#000, 33.5%);
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000, 20%),
-        '700': $-gray-700,
-        '600': lighten(#000, 46.7%),
-        '300': #d4d4d4,
-        '200': lighten(#000, 85%),
-    ));
-}
-
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #a1a52f,
-        'o-color-2': #66555c,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #242327,
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #679b96,
-        'o-color-2': #345552,
-        'o-color-3': #e9e9e9,
-        'o-color-4': #ffffff,
-        'o-color-5': #1e222f,
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #df699c,
-        'o-color-2': #590046,
-        'o-color-3': #dbe8ed,
-        'o-color-4': #ffffff,
-        'o-color-5': #222222,
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #b29964,
-        'o-color-2': #62624c,
-        'o-color-3': #f5f4f4,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #1ad68f,
-        'o-color-2': #2e2e2e,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #cfd744,
-        'o-color-2': #3d504a,
-        'o-color-3': #f0f1f1,
-        'o-color-4': #ffffff,
-        'o-color-5': #112625,
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
+        'loftspace-1': (
+            'alpha': #ffffff,
+            'beta': #cdd0a2,
+            'gamma': #b4bbb9,
+            'delta': #242327,
+            'epsilon': #957985,
+        ),
+        'loftspace-2': (
+            'alpha': #ffffff,
+            'beta': #e9e9e9,
+            'gamma': #c8efeb,
+            'delta': #1e222f,
+            'epsilon': #55e8da,
+        ),
+        'loftspace-3': (
+            'alpha': #ffffff,
+            'beta': #dbe8ed,
+            'gamma': #ecd5d6,
+            'delta': #590046,
+            'epsilon': #df699c,
+        ),
+        'loftspace-4': (
+            'alpha': #ffffff,
+            'beta': #d3d3d3,
+            'gamma': #f2ef1a,
+            'delta': #000000,
+            'epsilon': #f1aa6b,
+        ),
+        'loftspace-5': (
+            'alpha': #ffffff,
+            'beta': #cfcfcf,
+            'gamma': #2e2e2e,
+            'delta': #000000,
+            'epsilon': #1ad68f,
+        ),
+        'loftspace-6': (
+            'alpha': #ffffff,
+            'beta': #9fcae2,
+            'gamma': #bbc05c,
+            'delta': #112625,
+            'epsilon': #45b08c,
+        ),
+    )
 );
 
 //------------------------------------------------------------------------------
@@ -204,6 +123,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'loftspace-1',
         'header-font-size': .95rem,
         'btn-border-radius': 0,
         'btn-border-radius-lg': 0,
@@ -217,3 +137,31 @@ $o-website-values-palettes: (
         'link-underline': 'never',
     ),
 );
+
+$o-palette-priority-prefix: 'loftspace';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'loftspace-1',
+    2: 'loftspace-2',
+    3: 'loftspace-3',
+    4: 'loftspace-4',
+    5: 'loftspace-5',
+    6: 'loftspace-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
+);
diff --git a/theme_loftspace/views/assets.xml b/theme_loftspace/views/assets.xml
deleted file mode 100644
index be061e967..000000000
--- a/theme_loftspace/views/assets.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_loftspace/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_secondary_variables" inherit_id="website._assets_secondary_variables" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_loftspace/static/src/scss/secondary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_loftspace/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_loftspace/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_loftspace/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_loftspace/views/old_snippets/s_banner_parallax.xml b/theme_loftspace/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index 771b05acf..000000000
--- a/theme_loftspace/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_loftspace/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_loftspace/views/old_snippets/s_features_carousel.xml b/theme_loftspace/views/old_snippets/s_features_carousel.xml
deleted file mode 100644
index 870a57a77..000000000
--- a/theme_loftspace/views/old_snippets/s_features_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_features_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_features_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_loftspace/static/src/old_snippets/s_features_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_loftspace/views/old_snippets/s_products_carousel.xml b/theme_loftspace/views/old_snippets/s_products_carousel.xml
deleted file mode 100644
index 5d1373ecf..000000000
--- a/theme_loftspace/views/old_snippets/s_products_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_products_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_products_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_loftspace/static/src/old_snippets/s_products_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_monglia/__manifest__.py b/theme_monglia/__manifest__.py
index bf4c11e68..9724a1555 100644
--- a/theme_monglia/__manifest__.py
+++ b/theme_monglia/__manifest__.py
@@ -8,19 +8,20 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_content.xml',
         'views/customizations.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-        'views/old_snippets/s_big_icons.xml',
-        'views/old_snippets/s_features_carousel.xml',
-        'views/old_snippets/s_products_carousel.xml',
-    ],
+        ],
     'images': [
         'static/description/monglia_description.png',
         'static/description/monglia_screenshot.jpeg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-monglia.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_monglia/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_monglia/data/ir_asset.xml b/theme_monglia/data/ir_asset.xml
new file mode 100644
index 000000000..4cbfdee9a
--- /dev/null
+++ b/theme_monglia/data/ir_asset.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_monglia.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_monglia.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_monglia/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_monglia.s_features_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_monglia.s_features_carousel_000_variables_scss</field>
+            <field name="name">Features carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_monglia/static/src/old_snippets/s_features_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_monglia.s_products_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_monglia.s_products_carousel_000_variables_scss</field>
+            <field name="name">Products carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_monglia/static/src/old_snippets/s_products_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_monglia.s_big_icons_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_monglia.s_big_icons_000_variables_scss</field>
+            <field name="name">Big icons 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_monglia/static/src/old_snippets/s_big_icons/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_monglia.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_monglia.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_monglia/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_monglia.secondary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_monglia.secondary_variables_scss</field>
+            <field name="name">Secondary variables SCSS</field>
+            <field name="bundle">web._assets_secondary_variables</field>
+            <field name="glob">theme_monglia/static/src/scss/secondary_variables.scss</field>
+        </record>
+
+        <record id="theme_monglia.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_monglia.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_monglia/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_monglia/models/theme_monglia.py b/theme_monglia/models/theme_monglia.py
index 5cfff19b1..10ac24bab 100644
--- a/theme_monglia/models/theme_monglia.py
+++ b/theme_monglia/models/theme_monglia.py
@@ -6,7 +6,7 @@ class ThemeMonglia(models.AbstractModel):
 
     def _theme_monglia_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-1')
+        # self.enable_asset('theme_common.compatibility_saas_10_1')
 
         self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_hamburger')
diff --git a/theme_monglia/static/src/scss/primary_variables.scss b/theme_monglia/static/src/scss/primary_variables.scss
index e82e71e54..55287f0fd 100644
--- a/theme_monglia/static/src/scss/primary_variables.scss
+++ b/theme_monglia/static/src/scss/primary_variables.scss
@@ -4,113 +4,51 @@
 //------------------------------------------------------------------------------
 
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #ffffff,
-        'beta': #add3ce,
-        'gamma': #a7c7d5,
-        'delta': #47464b,
-        'epsilon': #f3997b,
-    ),
-    (
-        'alpha': #f8f1d4,
-        'beta': #5b4645,
-        'gamma': #ffffff,
-        'delta': #21263a,
-        'epsilon': #8f8747,
-    ),
-    (
-        'alpha': #dedede,
-        'beta': #adadad,
-        'gamma': #ffffff,
-        'delta': #3e3e3e,
-        'epsilon': #848f47,
-    ),
-    (
-        'alpha': #cfcfcf,
-        'beta': #2e2e2e,
-        'gamma': #ffffff,
-        'delta': #000000,
-        'epsilon': #1ad68f,
-    ),
-    (
-        'alpha': #9fcae2,
-        'beta': #bbc05c,
-        'gamma': #ffffff,
-        'delta': #112625,
-        'epsilon': #45b08c,
-    ),
-    (
-        'alpha': #fdeacc,
-        'beta': #e8cda2,
-        'gamma': #ffffff,
-        'delta': #3e3f43,
-        'epsilon': #e1444d,
-    ),
-);
-
-// Grays
-$-gray-700: lighten(#000, 33.5%);
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000000, 20%),
-        '700': $-gray-700,
-        '600': lighten(#000000, 46.7%),
-        '200': lighten(#000000, 85%),
-    ));
-}
-
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #ed145b,
-        'o-color-2': #9CD6FA,
-        'o-color-3': #f5f5f5,
-        'o-color-4': #ffffff,
-        'o-color-5': #111111,
-    ),
-    (
-        'o-color-1': #8f8747,
-        'o-color-2': #5b4645,
-        'o-color-3': #f0ecdb,
-        'o-color-4': #ffffff,
-        'o-color-5': #21263a,
-    ),
-    (
-        'o-color-1': #c0ce75,
-        'o-color-2': #704562,
-        'o-color-3': #dedede,
-        'o-color-4': #ffffff,
-        'o-color-5': #3e3e3e,
-    ),
-    (
-        'o-color-1': #1ad68f,
-        'o-color-2': #2e2e2e,
-        'o-color-3': #cfcfcf,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-    ),
-    (
-        'o-color-1': #c5ca60,
-        'o-color-2': #40a181,
-        'o-color-3': #bfddec,
-        'o-color-4': #ffffff,
-        'o-color-5': #112625,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #da557d,
-        'o-color-2': #6d4046,
-        'o-color-3': #fffddc,
-        'o-color-4': #ffffff,
-        'o-color-5': #3e3f43,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
+        'monglia-1': (
+            'alpha': #ffffff,
+            'beta': #add3ce,
+            'gamma': #a7c7d5,
+            'delta': #47464b,
+            'epsilon': #f3997b,
+        ),
+        'monglia-2': (
+            'alpha': #f8f1d4,
+            'beta': #5b4645,
+            'gamma': #ffffff,
+            'delta': #21263a,
+            'epsilon': #8f8747,
+        ),
+        'monglia-3': (
+            'alpha': #dedede,
+            'beta': #adadad,
+            'gamma': #ffffff,
+            'delta': #3e3e3e,
+            'epsilon': #848f47,
+        ),
+        'monglia-4': (
+            'alpha': #cfcfcf,
+            'beta': #2e2e2e,
+            'gamma': #ffffff,
+            'delta': #000000,
+            'epsilon': #1ad68f,
+        ),
+        'monglia-5': (
+            'alpha': #9fcae2,
+            'beta': #bbc05c,
+            'gamma': #ffffff,
+            'delta': #112625,
+            'epsilon': #45b08c,
+        ),
+        'monglia-6': (
+            'alpha': #fdeacc,
+            'beta': #e8cda2,
+            'gamma': #ffffff,
+            'delta': #3e3f43,
+            'epsilon': #e1444d,
+        ),
+    )
 );
 
 //------------------------------------------------------------------------------
@@ -197,6 +135,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'monglia-1',
+
         'header-font-size': (18 / 16) * 1rem,
         'font': 'Roboto',
         'headings-font': 'Darker Grotesque',
@@ -218,3 +158,31 @@ $o-website-values-palettes: (
         'btn-padding-x-lg': 2rem,
     ),
 );
+
+$o-palette-priority-prefix: 'monglia';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'monglia-1',
+    2: 'monglia-2',
+    3: 'monglia-3',
+    4: 'monglia-4',
+    5: 'monglia-5',
+    6: 'monglia-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
+);
diff --git a/theme_monglia/views/assets.xml b/theme_monglia/views/assets.xml
deleted file mode 100644
index 0dc82d0be..000000000
--- a/theme_monglia/views/assets.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_monglia/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_secondary_variables" inherit_id="website._assets_secondary_variables" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_monglia/static/src/scss/secondary_variables.scss"/>
-        </xpath>
-    </template>
-
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_monglia/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-
-    <!-- Onboarding Tour -->
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_monglia/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_monglia/views/old_snippets/s_banner_parallax.xml b/theme_monglia/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index fe4cf2e94..000000000
--- a/theme_monglia/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_monglia/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_monglia/views/old_snippets/s_big_icons.xml b/theme_monglia/views/old_snippets/s_big_icons.xml
deleted file mode 100644
index a77ff99d8..000000000
--- a/theme_monglia/views/old_snippets/s_big_icons.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_big_icons_css_000_variables" inherit_id="theme_common._assets_snippet_s_big_icons_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_monglia/static/src/old_snippets/s_big_icons/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_monglia/views/old_snippets/s_features_carousel.xml b/theme_monglia/views/old_snippets/s_features_carousel.xml
deleted file mode 100644
index 930ccb30b..000000000
--- a/theme_monglia/views/old_snippets/s_features_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_features_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_features_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_monglia/static/src/old_snippets/s_features_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_monglia/views/old_snippets/s_products_carousel.xml b/theme_monglia/views/old_snippets/s_products_carousel.xml
deleted file mode 100644
index b9ae83cdb..000000000
--- a/theme_monglia/views/old_snippets/s_products_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_products_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_products_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_monglia/static/src/old_snippets/s_products_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_nano/__manifest__.py b/theme_nano/__manifest__.py
index 08bebafa5..6111c44b1 100644
--- a/theme_nano/__manifest__.py
+++ b/theme_nano/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_library.xml',
 
         'views/snippets/s_carousel.xml',
@@ -22,5 +22,10 @@
         'static/description/nano_screenshot.jpeg',
     ],
     'license': 'LGPL-3',
-    'live_test_url': 'https://theme-nano.odoo.com'
+    'live_test_url': 'https://theme-nano.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_nano/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_nano/data/ir_asset.xml b/theme_nano/data/ir_asset.xml
new file mode 100644
index 000000000..ff768bb7b
--- /dev/null
+++ b/theme_nano/data/ir_asset.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_nano.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_nano.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_nano/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_nano.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_nano.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_nano/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_nano/models/theme_nano.py b/theme_nano/models/theme_nano.py
index 53760141c..5176a1dbe 100644
--- a/theme_nano/models/theme_nano.py
+++ b/theme_nano/models/theme_nano.py
@@ -17,6 +17,7 @@ class ThemeNano(models.AbstractModel):
         self.enable_view('website.template_footer_slideout')
         self.enable_view('website.option_footer_scrolltop')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
 
         self.disable_view('portal.footer_language_selector')
diff --git a/theme_nano/static/src/scss/primary_variables.scss b/theme_nano/static/src/scss/primary_variables.scss
index 267e1e3a6..cfb466a6e 100644
--- a/theme_nano/static/src/scss/primary_variables.scss
+++ b/theme_nano/static/src/scss/primary_variables.scss
@@ -4,6 +4,8 @@
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'nano-1',
+
         // Header
         'header-template':                  'sidebar',
         'hamburger-type':                   'off-canvas',
@@ -89,149 +91,78 @@ $o-theme-font-configs: (
 // Colors
 //------------------------------------------------------------------------------//
 
-$o-color-palettes: (
-    ( // Palette 1
-        'o-color-1':                        #ed8558,
-        'o-color-2':                        #74bcc5,
-        'o-color-3':                        #efe9e0,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #23262b,
-
-        'o-cc2-headings':                   'o-color-5',
-        'o-cc3-btn-primary':                'o-color-4',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-2',
-
-        'preheader':                        4,
-        'menu':                             5,
-        'footer':                           2,
-        'copyright':                        5,
-    ),
-    ( // Palette 2
-        'o-color-1':                        #e77557,
-        'o-color-2':                        #213047,
-        'o-color-3':                        #f2f2f2,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #23262b,
-
-        'o-cc2-headings':                   'o-color-2',
-        'o-cc4-link':                       'o-color-4',
-
-        'menu':                             3,
-        'footer':                           2,
-        'copyright':                        2,
-    ),
-    ( // Palette 3
-        'o-color-1':                        #85bf4b,
-        'o-color-2':                        #74bcc5,
-        'o-color-3':                        #eaf2df,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #23262b,
-
-        'o-cc2-headings':                   'o-color-5',
-        'o-cc3-btn-primary':                'o-color-5',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-2',
-
-        'menu':                             5,
-        'footer':                           5,
-        'copyright':                        5,
-    ),
-    ( // Palette 4
-        'o-color-1':                        #16c6cc,
-        'o-color-2':                        #d72d3c,
-        'o-color-3':                        #e9ecef,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #23262b,
-
-        'o-cc2-headings':                   'o-color-5',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-
-        'menu':                             5,
-        'footer':                           2,
-        'copyright':                        4,
-    ),
-    ( // Palette 5
-        'o-color-1':                        #c7db58,
-        'o-color-2':                        #413659,
-        'o-color-3':                        #efefed,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #23262b,
-
-        'o-cc2-headings':                   'o-color-5',
-        'o-cc2-link':                       'o-color-2',
-        'o-cc3-link':                       'o-color-1',
-        'o-cc5-link':                       'o-color-1',
-
-        'menu':                             3,
-        'footer':                           2,
-        'copyright':                        3,
-    ),
-    ( // Palette 6
-        'o-color-1':                        #db5d6b,
-        'o-color-2':                        #5acaaf,
-        'o-color-3':                        #efefed,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #23262b,
-
-        'o-cc3-link':                       'o-color-3',
-        'o-cc3-btn-primary':                'o-color-5',
-        'o-cc4-link':                       'o-color-3',
-        'o-cc5-headings':                   'o-color-1',
-        'o-cc5-link':                       'o-color-1',
-
-        'menu':                             5,
-        'footer':                           2,
-        'copyright':                        5,
-
-        'o-cc2-headings':                   'o-color-5',
-    ),
-);
 // Compatibility
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha':                            #ed8558,
-        'beta':                             #74bcc5,
-        'gamma':                            #7cc086,
-        'delta':                            #afd5a6,
-        'epsilon':                          #f3da80,
-    ),
-    (
-        'alpha':                            #ed8c2b,
-        'beta':                             #cf4a30,
-        'gamma':                            #911146,
-        'delta':                            #35203b,
-        'epsilon':                          #88a825,
-    ),
-    (
-        'alpha':                            #79bd8f,
-        'beta':                             #00a388,
-        'gamma':                            #046380,
-        'delta':                            #4bb5C1,
-        'epsilon':                          #beeb9f,
-    ),
-    (
-        'alpha':                            #16c6cc,
-        'beta':                             #d72d3c,
-        'gamma':                            #ff6d3b,
-        'delta':                            #ffb733,
-        'epsilon':                          #ffd55c,
-    ),
-    (
-        'alpha':                            #14212b,
-        'beta':                             #e6e2af,
-        'gamma':                            #c9de55,
-        'delta':                            #962d3e,
-        'epsilon':                          #413659,
-    ),
-    (
-        'alpha':                            #db5d6b,
-        'beta':                             #ea958e,
-        'gamma':                            #fffcdb,
-        'delta':                            #d4e090,
-        'epsilon':                          #79d4be,
-    ),
+        'nano-1': (
+            'alpha':                            #ed8558,
+            'beta':                             #74bcc5,
+            'gamma':                            #7cc086,
+            'delta':                            #afd5a6,
+            'epsilon':                          #f3da80,
+        ),
+        'nano-2': (
+            'alpha':                            #ed8c2b,
+            'beta':                             #cf4a30,
+            'gamma':                            #911146,
+            'delta':                            #35203b,
+            'epsilon':                          #88a825,
+        ),
+        'nano-3': (
+            'alpha':                            #79bd8f,
+            'beta':                             #00a388,
+            'gamma':                            #046380,
+            'delta':                            #4bb5C1,
+            'epsilon':                          #beeb9f,
+        ),
+        'nano-4': (
+            'alpha':                            #16c6cc,
+            'beta':                             #d72d3c,
+            'gamma':                            #ff6d3b,
+            'delta':                            #ffb733,
+            'epsilon':                          #ffd55c,
+        ),
+        'nano-5': (
+            'alpha':                            #14212b,
+            'beta':                             #e6e2af,
+            'gamma':                            #c9de55,
+            'delta':                            #962d3e,
+            'epsilon':                          #413659,
+        ),
+        'nano-6': (
+            'alpha':                            #db5d6b,
+            'beta':                             #ea958e,
+            'gamma':                            #fffcdb,
+            'delta':                            #d4e090,
+            'epsilon':                          #79d4be,
+        ),
+    )
+);
+
+$o-palette-priority-prefix: 'nano';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'nano-1',
+    2: 'nano-2',
+    3: 'nano-3',
+    4: 'nano-4',
+    5: 'nano-5',
+    6: 'nano-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
 );
diff --git a/theme_nano/views/assets.xml b/theme_nano/views/assets.xml
deleted file mode 100644
index 84c59fdba..000000000
--- a/theme_nano/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_nano/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_nano/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_nano/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_notes/__manifest__.py b/theme_notes/__manifest__.py
index 1a6377c1d..073974225 100644
--- a/theme_notes/__manifest__.py
+++ b/theme_notes/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_library.xml',
 
         'views/snippets/s_carousel.xml',
@@ -16,13 +16,16 @@
         'views/snippets/s_media_list.xml',
         'views/snippets/s_company_team.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-        'views/old_snippets/s_features_carousel.xml',
-    ],
+        ],
     'images': [
         'static/description/Notes_description.png',
         'static/description/notes_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-notes.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_notes/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_notes/data/ir_asset.xml b/theme_notes/data/ir_asset.xml
new file mode 100644
index 000000000..95aa6577a
--- /dev/null
+++ b/theme_notes/data/ir_asset.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_notes.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_notes.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_notes/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_notes.s_features_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_notes.s_features_carousel_000_variables_scss</field>
+            <field name="name">Features carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_notes/static/src/old_snippets/s_features_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_notes.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_notes.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_notes/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_notes.secondary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_notes.secondary_variables_scss</field>
+            <field name="name">Secondary variables SCSS</field>
+            <field name="bundle">web._assets_secondary_variables</field>
+            <field name="glob">theme_notes/static/src/scss/secondary_variables.scss</field>
+        </record>
+
+        <record id="theme_notes.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_notes.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_notes/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+        <record id="theme_notes.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_notes.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_notes/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_notes/models/theme_notes.py b/theme_notes/models/theme_notes.py
index aa640ced0..435b48d1e 100644
--- a/theme_notes/models/theme_notes.py
+++ b/theme_notes/models/theme_notes.py
@@ -14,4 +14,4 @@ class ThemeNotes(models.AbstractModel):
         self.enable_view('website.template_footer_descriptive')
 
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-1')
+        # self.enable_asset('theme_common.compatibility_saas_10_1')
diff --git a/theme_notes/static/src/scss/primary_variables.scss b/theme_notes/static/src/scss/primary_variables.scss
index 42dc3a402..b957c1d80 100644
--- a/theme_notes/static/src/scss/primary_variables.scss
+++ b/theme_notes/static/src/scss/primary_variables.scss
@@ -3,114 +3,53 @@
 //------------------------------------------------------------------------------
 
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #ffffff,
-        'beta': #47464b,
-        'gamma': #3B3D4D,
-        'delta': #E6FA16,
-        'epsilon': #9B96B4,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #101010,
-        'gamma': #474747,
-        'delta': #ff0000,
-        'epsilon': #e94060,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #19272c,
-        'gamma': #90c0cf,
-        'delta': #e94060,
-        'epsilon': #5ed7e9,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #212523,
-        'gamma': #2d6a51,
-        'delta': #72bd9e,
-        'epsilon': #bcfa16,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #4B4D52,
-        'gamma': #DE8642,
-        'delta': #B9B1A8,
-        'epsilon': #FFF2E7,
-    ),
-    (
-        'alpha': #ffffff,
-        'beta': #fee202,
-        'gamma': #514947,
-        'delta': #48372f,
-        'epsilon': #766151,
-    ),
+        'notes-1': (
+            'alpha': #ffffff,
+            'beta': #47464b,
+            'gamma': #3B3D4D,
+            'delta': #E6FA16,
+            'epsilon': #9B96B4,
+        ),
+        'notes-2': (
+            'alpha': #ffffff,
+            'beta': #101010,
+            'gamma': #474747,
+            'delta': #ff0000,
+            'epsilon': #e94060,
+        ),
+        'notes-3': (
+            'alpha': #ffffff,
+            'beta': #19272c,
+            'gamma': #90c0cf,
+            'delta': #e94060,
+            'epsilon': #5ed7e9,
+        ),
+        'notes-4': (
+            'alpha': #ffffff,
+            'beta': #212523,
+            'gamma': #2d6a51,
+            'delta': #72bd9e,
+            'epsilon': #bcfa16,
+        ),
+        'notes-5': (
+            'alpha': #ffffff,
+            'beta': #4B4D52,
+            'gamma': #DE8642,
+            'delta': #B9B1A8,
+            'epsilon': #FFF2E7,
+        ),
+        'notes-6': (
+            'alpha': #ffffff,
+            'beta': #fee202,
+            'gamma': #514947,
+            'delta': #48372f,
+            'epsilon': #766151,
+        ),
+    )
 );
 
-$o-color-palettes: (
-    (
-        'o-color-1': #a1c005,
-        'o-color-2': #9B96B4,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #212121,
-
-        'o-cc2-headings': 'o-color-5',
-
-        'menu': 5,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #5191f0,
-        'o-color-2': #394b44,
-        'o-color-3': #f6f3ef,
-        'o-color-4': #ffffff,
-        'o-color-5': #212523,
-
-        'menu': 3,
-        'footer': 3,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #DE8642,
-        'o-color-2': #B9B1A8,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #4B4D52,
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #ebd425,
-        'o-color-2': #48372f,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #352e2e,
-
-        'o-cc2-headings': 'o-color-5',
-        'o-cc4-text': 'o-color-5',
-
-        'menu': 3,
-        'footer': 3,
-        'copyright': 4,
-    ),
-);
-
-// Grays
-$-gray-700: lighten(#000, 33.5%);
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000, 20%),
-        '700': $-gray-700,
-        '600': lighten(#000, 46.7%),
-        '200': lighten(#000, 85%),
-    ));
-}
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -174,6 +113,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'notes-1',
         'header-font-size': 1.25rem,
         'logo-height': 3rem,
         'fixed-logo-height': 3rem,
@@ -188,3 +128,38 @@ $o-website-values-palettes: (
         'hamburger-type': 'off-canvas',
     ),
 );
+
+$o-palette-priority-prefix: 'notes';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'notes-1',
+    2: 'notes-2',
+    3: 'notes-3',
+    4: 'notes-4',
+    5: 'generic-1',
+    6: 'generic-2',
+    7: 'generic-3',
+    8: 'generic-4',
+    9: 'generic-5',
+    10: 'generic-6',
+    11: 'generic-7',
+    12: 'generic-8',
+    13: 'generic-9',
+    14: 'generic-10',
+    15: 'generic-11',
+    16: 'generic-12',
+    17: 'generic-13',
+    18: 'generic-14',
+    19: 'generic-15',
+    20: 'generic-16',
+    21: 'generic-17',
+);
+
+$o-theme-color-palettes-compatibility-indexes: (
+    1: 'notes-1',
+    2: 'notes-2',
+    3: 'notes-3',
+    4: 'notes-4',
+    5: 'notes-5',
+    6: 'notes-6',
+);
diff --git a/theme_notes/views/assets.xml b/theme_notes/views/assets.xml
deleted file mode 100644
index 75c600a24..000000000
--- a/theme_notes/views/assets.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_notes/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_secondary_variables" inherit_id="website._assets_secondary_variables" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_notes/static/src/scss/secondary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_notes/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_notes/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_notes/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_notes/views/old_snippets/s_banner_parallax.xml b/theme_notes/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index a2d9f5df7..000000000
--- a/theme_notes/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_notes/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_notes/views/old_snippets/s_features_carousel.xml b/theme_notes/views/old_snippets/s_features_carousel.xml
deleted file mode 100644
index 24bb74ad4..000000000
--- a/theme_notes/views/old_snippets/s_features_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_features_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_features_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_notes/static/src/old_snippets/s_features_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_odoo_experts/__manifest__.py b/theme_odoo_experts/__manifest__.py
index 38ab4c3f0..058b5b052 100644
--- a/theme_odoo_experts/__manifest__.py
+++ b/theme_odoo_experts/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
 
         'views/snippets/s_banner.xml',
@@ -16,12 +16,16 @@
         'views/snippets/s_image_text.xml',
         'views/snippets/s_call_to_action.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-    ],
+        ],
     'images': [
         'static/description/odoo_experts_description.png',
         'static/description/odoo_experts_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-odoo-experts.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_odoo_experts/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_odoo_experts/data/ir_asset.xml b/theme_odoo_experts/data/ir_asset.xml
new file mode 100644
index 000000000..97083201d
--- /dev/null
+++ b/theme_odoo_experts/data/ir_asset.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_odoo_experts.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_odoo_experts.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_odoo_experts/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_odoo_experts.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_odoo_experts.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_odoo_experts/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_odoo_experts.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_odoo_experts.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_odoo_experts/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_odoo_experts/static/src/scss/primary_variables.scss b/theme_odoo_experts/static/src/scss/primary_variables.scss
index eb0f47c88..572bc6513 100644
--- a/theme_odoo_experts/static/src/scss/primary_variables.scss
+++ b/theme_odoo_experts/static/src/scss/primary_variables.scss
@@ -1,60 +1,3 @@
-//------------------------------------------------------------------------------
-// Colors
-//------------------------------------------------------------------------------
-$o-color-palettes: (
-    (
-        'o-color-1': #278f84,
-        'o-color-2': #494048,
-        'o-color-3': #f9f9f9,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #201c20,
-
-        'o-cc5-link': #65e4d7,
-
-        'menu': 3,
-        'footer': 3,
-        'copyright': 3,
-    ),
-    (
-        'o-color-1': #414f8a,
-        'o-color-2': #888888,
-        'o-color-3': #f9f9f9,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #222222,
-
-        'o-cc5-text': #b8b7b7,
-        'o-cc5-link': 'o-color-4',
-
-        'menu': 5,
-        'footer': 5,
-        'copyright': 5,
-    ),
-    (
-        'o-color-1': #dfcc60,
-        'o-color-2': #7f6262,
-        'o-color-3': #f9f9f9,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #352626,
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #01e0b5,
-        'o-color-2': #5c7aff,
-        'o-color-3': #f9f9f9,
-        'o-color-4': #FFFFFF,
-        'o-color-5': #444444,
-
-        'o-cc2-link': 'o-color-5',
-
-        'menu': 3,
-        'footer': 3,
-        'copyright': 3,
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -123,6 +66,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'odoo-experts-1',
         'logo-height': (52 / 16) * 1rem,
         'fixed-logo-height': (52 / 16) * 1rem,
         'header-font-size': (18 / 16) * 1rem,
@@ -138,3 +82,29 @@ $o-website-values-palettes: (
         'header-links-style': 'border-bottom',
     ),
 );
+
+$o-palette-priority-prefix: 'odoo-experts';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'odoo-experts-1',
+    2: 'odoo-experts-2',
+    3: 'odoo-experts-3',
+    4: 'odoo-experts-4',
+    5: 'generic-1',
+    6: 'generic-2',
+    7: 'generic-3',
+    8: 'generic-4',
+    9: 'generic-5',
+    10: 'generic-6',
+    11: 'generic-7',
+    12: 'generic-8',
+    13: 'generic-9',
+    14: 'generic-10',
+    15: 'generic-11',
+    16: 'generic-12',
+    17: 'generic-13',
+    18: 'generic-14',
+    19: 'generic-15',
+    20: 'generic-16',
+    21: 'generic-17',
+);
diff --git a/theme_odoo_experts/views/assets.xml b/theme_odoo_experts/views/assets.xml
deleted file mode 100644
index 78ae3df6f..000000000
--- a/theme_odoo_experts/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_odoo_experts/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_odoo_experts/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_odoo_experts/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_odoo_experts/views/old_snippets/s_banner_parallax.xml b/theme_odoo_experts/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index 35d04d13a..000000000
--- a/theme_odoo_experts/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_odoo_experts/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_orchid/__manifest__.py b/theme_orchid/__manifest__.py
index f2b0c2c54..6e274cf78 100644
--- a/theme_orchid/__manifest__.py
+++ b/theme_orchid/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
 
         'views/snippets/s_cover.xml',
@@ -24,4 +24,9 @@
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-orchid.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_orchid/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_orchid/data/ir_asset.xml b/theme_orchid/data/ir_asset.xml
new file mode 100644
index 000000000..efd881b29
--- /dev/null
+++ b/theme_orchid/data/ir_asset.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_orchid.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_orchid.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_orchid/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_orchid.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_orchid.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_orchid/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_orchid/static/src/scss/primary_variables.scss b/theme_orchid/static/src/scss/primary_variables.scss
index 23a99bf68..634ddc877 100644
--- a/theme_orchid/static/src/scss/primary_variables.scss
+++ b/theme_orchid/static/src/scss/primary_variables.scss
@@ -1,68 +1,3 @@
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #a1a52f,
-        'o-color-2': #66555c,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #242327,
-
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #679b96,
-        'o-color-2': #345552,
-        'o-color-3': #e9e9e9,
-        'o-color-4': #ffffff,
-        'o-color-5': #1e222f,
-
-        'footer': 1,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #df699c,
-        'o-color-2': #590046,
-        'o-color-3': #dbe8ed,
-        'o-color-4': #ffffff,
-        'o-color-5': #222222,
-
-        'footer': 1,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #b29964,
-        'o-color-2': #62624c,
-        'o-color-3': #f5f4f4,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'footer': 1,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #1ad68f,
-        'o-color-2': #2e2e2e,
-        'o-color-3': #f7f7f7,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'footer': 1,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #cfd744,
-        'o-color-2': #3d504a,
-        'o-color-3': #f0f1f1,
-        'o-color-4': #ffffff,
-        'o-color-5': #112625,
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 5,
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -119,6 +54,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'orchid-1',
         'font': 'Questrial',
         'headings-font': 'Questrial',
         'navbar-font': 'Questrial',
@@ -127,3 +63,31 @@ $o-website-values-palettes: (
         'footer-template': 'descriptive',
     ),
 );
+
+$o-palette-priority-prefix: 'orchid';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'orchid-1',
+    2: 'orchid-2',
+    3: 'orchid-3',
+    4: 'orchid-4',
+    5: 'orchid-5',
+    6: 'orchid-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
+);
diff --git a/theme_orchid/views/assets.xml b/theme_orchid/views/assets.xml
deleted file mode 100644
index 51b13bd23..000000000
--- a/theme_orchid/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_orchid/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_orchid/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_orchid/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_paptic/__manifest__.py b/theme_paptic/__manifest__.py
index b370a3520..00bd5160a 100644
--- a/theme_paptic/__manifest__.py
+++ b/theme_paptic/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['website'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
         'views/customizations.xml',
     ],
@@ -17,5 +17,10 @@
         'static/description/paptic_screenshot.jpg',
     ],
     'license': 'LGPL-3',
-    'live_test_url': 'https://theme-paptic.odoo.com'
+    'live_test_url': 'https://theme-paptic.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_paptic/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_paptic/data/ir_asset.xml b/theme_paptic/data/ir_asset.xml
new file mode 100644
index 000000000..374283158
--- /dev/null
+++ b/theme_paptic/data/ir_asset.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_paptic.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_paptic.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_paptic/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_paptic.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_paptic.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_paptic/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_paptic/models/theme_paptic.py b/theme_paptic/models/theme_paptic.py
index 5332982db..6635b0ae0 100644
--- a/theme_paptic/models/theme_paptic.py
+++ b/theme_paptic/models/theme_paptic.py
@@ -6,8 +6,9 @@ class ThemePaptic(models.AbstractModel):
 
     def _theme_paptic_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-2')
+        # self.enable_asset('theme_common.compatibility_saas_10_2')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
         self.enable_view('website.template_footer_centered')
         self.enable_header_off_canvas()
diff --git a/theme_paptic/static/src/scss/primary_variables.scss b/theme_paptic/static/src/scss/primary_variables.scss
index f76e4cd8a..4415cf643 100644
--- a/theme_paptic/static/src/scss/primary_variables.scss
+++ b/theme_paptic/static/src/scss/primary_variables.scss
@@ -1,34 +1,3 @@
-//------------------------------------------------------------------------------
-// Colors
-//------------------------------------------------------------------------------
-
-$o-color-palettes: (
-    (   // Palette 1
-        'o-color-1': #6772E5,
-        'o-color-2': #F5F9F9,
-        'o-color-3': #34B885,
-        'o-color-4': #ffffff,
-        'o-color-5': #9BA9BB,
-
-        'o-cc1-headings': 'o-color-5',
-        'o-cc1-link': 'o-color-1',
-        'o-cc1-btn-secondary': 'o-color-5',
-        'o-cc1-btn-secondary-border': 'o-color-5',
-
-        'o-cc2-headings': 'o-color-2',
-        'o-cc2-link': #40fffb,
-
-        'o-cc3-headings': 'o-color-3',
-
-        'o-cc4-link': #40fffb,
-        'o-cc5-link': #40fffb,
-
-        'header': 1,
-        'footer': 1,
-        'copyright': 3,
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -64,6 +33,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'paptic-1',
+
         'font': 'Inter',
         'headings-font': 'Nunito',
         'navbar-font': 'Nunito',
@@ -85,3 +56,26 @@ $o-website-values-palettes: (
         'btn-padding-x-lg': (28 / 16) * 1rem,
     ),
 );
+
+$o-palette-priority-prefix: 'paptic';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'paptic-1',
+    2: 'generic-1',
+    3: 'generic-2',
+    4: 'generic-3',
+    5: 'generic-4',
+    6: 'generic-5',
+    7: 'generic-6',
+    8: 'generic-7',
+    9: 'generic-8',
+    10: 'generic-9',
+    11: 'generic-10',
+    12: 'generic-11',
+    13: 'generic-12',
+    14: 'generic-13',
+    15: 'generic-14',
+    16: 'generic-15',
+    17: 'generic-16',
+    18: 'generic-17',
+);
diff --git a/theme_paptic/views/assets.xml b/theme_paptic/views/assets.xml
deleted file mode 100644
index 727445879..000000000
--- a/theme_paptic/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_paptic/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_paptic/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-
-    <!-- Onboarding Tour -->
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_paptic/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_real_estate/__manifest__.py b/theme_real_estate/__manifest__.py
index 0e06545a6..a754925bc 100644
--- a/theme_real_estate/__manifest__.py
+++ b/theme_real_estate/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
 
         'views/snippets/s_banner.xml',
@@ -23,4 +23,9 @@
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-real-estate.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_real_estate/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_real_estate/data/ir_asset.xml b/theme_real_estate/data/ir_asset.xml
new file mode 100644
index 000000000..8c3f0982e
--- /dev/null
+++ b/theme_real_estate/data/ir_asset.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_real_estate.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_real_estate.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_real_estate/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_real_estate.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_real_estate.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_real_estate/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_real_estate/models/theme_real_estate.py b/theme_real_estate/models/theme_real_estate.py
index d99dbe692..0201b673e 100644
--- a/theme_real_estate/models/theme_real_estate.py
+++ b/theme_real_estate/models/theme_real_estate.py
@@ -6,7 +6,7 @@ class ThemeRealEstate(models.AbstractModel):
 
     def _theme_real_estate_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-2')
+        # self.enable_asset('theme_common.compatibility_saas_10_2')
 
         self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_hamburger')
@@ -15,4 +15,5 @@ class ThemeRealEstate(models.AbstractModel):
         self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_descriptive')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
diff --git a/theme_real_estate/static/src/scss/primary_variables.scss b/theme_real_estate/static/src/scss/primary_variables.scss
index 8fcb2a0bf..4e4016634 100644
--- a/theme_real_estate/static/src/scss/primary_variables.scss
+++ b/theme_real_estate/static/src/scss/primary_variables.scss
@@ -1,55 +1,3 @@
-//------------------------------------------------------------------------------
-// Palette
-//------------------------------------------------------------------------------
-
-$o-color-palettes: (
-    (
-        'o-color-1': #539b80,
-        'o-color-2': #2e2e2e,
-        'o-color-3': #f4f4f4,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'o-cc1-btn-primary': #1ad68f,
-        'o-cc5-link': #1ad68f,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-    (
-        'o-color-1': #006bff,
-        'o-color-2': #fda400,
-        'o-color-3': #F1F1F4,
-        'o-color-4': #ffffff,
-        'o-color-5': #2A2A33,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #cddf66,
-        'o-color-2': #b62682,
-        'o-color-3': #f4f5f2,
-        'o-color-4': #ffffff,
-        'o-color-5': #000000,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #007882,
-        'o-color-2': #48578a,
-        'o-color-3': #f4efeb,
-        'o-color-4': #ffffff,
-        'o-color-5': #33302e,
-
-        'o-cc5-link': #70c7cf,
-
-        'menu': 5,
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -126,6 +74,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'real-estate-1',
         'header-font-size': (18 / 16) * 1rem,
         'font': 'Nunito',
         'headings-font': 'Nunito',
@@ -138,3 +87,29 @@ $o-website-values-palettes: (
         'footer-template': 'descriptive',
     ),
 );
+
+$o-palette-priority-prefix: 'real-estate';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'real-estate-1',
+    2: 'real-estate-2',
+    3: 'real-estate-3',
+    4: 'real-estate-4',
+    5: 'generic-1',
+    6: 'generic-2',
+    7: 'generic-3',
+    8: 'generic-4',
+    9: 'generic-5',
+    10: 'generic-6',
+    11: 'generic-7',
+    12: 'generic-8',
+    13: 'generic-9',
+    14: 'generic-10',
+    15: 'generic-11',
+    16: 'generic-12',
+    17: 'generic-13',
+    18: 'generic-14',
+    19: 'generic-15',
+    20: 'generic-16',
+    21: 'generic-17',
+);
diff --git a/theme_real_estate/views/assets.xml b/theme_real_estate/views/assets.xml
deleted file mode 100644
index a9c076db6..000000000
--- a/theme_real_estate/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_real_estate/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_real_estate/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_real_estate/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_treehouse/__manifest__.py b/theme_treehouse/__manifest__.py
index 63b522b9d..ec3025ee9 100644
--- a/theme_treehouse/__manifest__.py
+++ b/theme_treehouse/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_library.xml',
 
         'views/snippets/s_call_to_action.xml',
@@ -24,13 +24,16 @@
         'views/snippets/s_three_columns.xml',
         'views/snippets/s_title.xml',
 
-        'views/old_snippets/s_images_carousel.xml',
-        'views/old_snippets/s_images_row.xml',
-    ],
+        ],
     'images': [
         'static/description/treehouse_cover.jpg',
         'static/description/treehouse_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-treehouse.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_treehouse/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_treehouse/data/ir_asset.xml b/theme_treehouse/data/ir_asset.xml
new file mode 100644
index 000000000..53d4e91f9
--- /dev/null
+++ b/theme_treehouse/data/ir_asset.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_treehouse.s_images_row_000_scss" model="theme.ir.asset">
+            <field name="key">theme_treehouse.s_images_row_000_scss</field>
+            <field name="name">Images row 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_treehouse/static/src/old_snippets/s_images_row/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_treehouse.s_images_carousel_000_scss" model="theme.ir.asset">
+            <field name="key">theme_treehouse.s_images_carousel_000_scss</field>
+            <field name="name">Images carousel 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">theme_treehouse/static/src/old_snippets/s_images_carousel/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_treehouse.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_treehouse.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_treehouse/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_treehouse.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_treehouse.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_treehouse/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_treehouse/models/theme_treehouse.py b/theme_treehouse/models/theme_treehouse.py
index e30272d6d..0226e1dea 100644
--- a/theme_treehouse/models/theme_treehouse.py
+++ b/theme_treehouse/models/theme_treehouse.py
@@ -13,4 +13,5 @@ class ThemeTreehouse(models.AbstractModel):
         self.enable_view('website.template_footer_slideout')
         self.enable_view('website.option_footer_scrolltop')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
diff --git a/theme_treehouse/static/src/scss/primary_variables.scss b/theme_treehouse/static/src/scss/primary_variables.scss
index 5902bb2a9..8c1f593a0 100644
--- a/theme_treehouse/static/src/scss/primary_variables.scss
+++ b/theme_treehouse/static/src/scss/primary_variables.scss
@@ -4,6 +4,8 @@
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'treehouse-1',
+
         // Header
         'logo-height':                      2.75rem,
         'fixed-logo-height':                2rem,
@@ -119,155 +121,78 @@ $o-theme-btn-font-weight:                   400;
 // Colors
 //------------------------------------------------------------------------------
 
-$o-color-palettes: (
-    ( // Palette 1
-        'o-color-1':                        #68b581,
-        'o-color-2':                        #046380,
-        'o-color-3':                        #e8e6d1,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #1d2127,
-
-        'o-cc1-text':                       'o-color-5',
-        'o-cc4-btn-primary':                'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-
-        'menu':                             1,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-    ( // Palette 2
-        'o-color-1':                        #8cc850,
-        'o-color-2':                        #cc4452,
-        'o-color-3':                        #f6f4e1,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #4c4545,
-
-        'o-cc1-text':                       'o-color-5',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-2',
-
-        'menu':                             5,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-    ( // Palette 3
-        'o-color-1':                        #e2ad3b,
-        'o-color-2':                        #1a2a41,
-        'o-color-3':                        #f2ebd5,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #d26400,
-
-        'o-cc1-text':                       'o-color-2',
-        'o-cc2-headings':                   'o-color-2',
-        'o-cc2-link':                       'o-color-2',
-        'o-cc3-headings':                   'o-color-3',
-        'o-cc5-link':                       'o-color-3',
-
-        'menu':                             3,
-        'footer':                           3,
-        'copyright':                        4,
-    ),
-    ( // Palette 4
-        'o-color-1':                        #0092b2,
-        'o-color-2':                        #046380,
-        'o-color-3':                        #f2ebd5,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #a8c545,
-
-        'o-cc1-text':                       #002737,
-        'o-cc2-headings':                   'o-color-2',
-        'o-cc3-headings':                   'o-color-3',
-        'o-cc3-link':                       'o-color-3',
-        'o-cc4-link':                       'o-color-3',
-        'o-cc4-btn-primary':                'o-color-3',
-        'o-cc4-btn-secondary':              'o-color-2',
-        'o-cc5-link':                       'o-color-2',
-        'o-cc5-btn-secondary':              'o-color-2',
-
-        'menu':                             1,
-        'footer':                           3,
-        'copyright':                        4,
-    ),
-    ( // Palette 5
-        'o-color-1':                        #dd7e43,
-        'o-color-2':                        #658791,
-        'o-color-3':                        #e3e9eb,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #d45c45,
-
-        'o-cc2-headings':                   'o-color-2',
-        'o-cc3-link':                       'o-color-3',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-4',
-        'o-cc5-link':                       'o-color-4',
-
-        'menu':                             1,
-        'footer':                           2,
-        'copyright':                        4,
-    ),
-    ( // Palette 6
-        'o-color-1':                        #92b475,
-        'o-color-2':                        #8c7d77,
-        'o-color-3':                        #efefed,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #011a33,
-
-        'o-cc1-text':                       'o-color-5',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc3-btn-secondary':              'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc4-btn-secondary':              'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-4',
-
-        'menu':                             2,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-);
-
 // Compatibility
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha':                            #68b581,
-        'beta':                             #00a388,
-        'gamma':                            #046380,
-        'delta':                            #4bb5c1,
-        'epsilon':                          #beeb9f,
-    ),
-    (
-        'alpha':                            #a3cc52,
-        'beta':                             #cc4452,
-        'gamma':                            #8e3557,
-        'delta':                            #f7f2b2,
-        'epsilon':                          #4a1a2c,
-    ),
-    (
-        'alpha':                            #eebf3e,
-        'beta':                             #e2ad3b,
-        'gamma':                            #bf5c00,
-        'delta':                            #77c4d3,
-        'epsilon':                          #901811,
-    ),
-    (
-        'alpha':                            #0092b2,
-        'beta':                             #046380,
-        'gamma':                            #a8c545,
-        'delta':                            #fff6c5,
-        'epsilon':                          #ffd55c,
-    ),
-    (
-        'alpha':                            #dd7e43,
-        'beta':                             #d45c45,
-        'gamma':                            #911146,
-        'delta':                            #9cc264,
-        'epsilon':                          #306e73,
-    ),
-    (
-        'alpha':                            #b7ca79,
-        'beta':                             #677e52,
-        'gamma':                            #b0cc99,
-        'delta':                            #89725b,
-        'epsilon':                          #f6e8b1,
-    ),
+        'treehouse-1': (
+            'alpha':                            #68b581,
+            'beta':                             #00a388,
+            'gamma':                            #046380,
+            'delta':                            #4bb5c1,
+            'epsilon':                          #beeb9f,
+        ),
+        'treehouse-2': (
+            'alpha':                            #a3cc52,
+            'beta':                             #cc4452,
+            'gamma':                            #8e3557,
+            'delta':                            #f7f2b2,
+            'epsilon':                          #4a1a2c,
+        ),
+        'treehouse-3': (
+            'alpha':                            #eebf3e,
+            'beta':                             #e2ad3b,
+            'gamma':                            #bf5c00,
+            'delta':                            #77c4d3,
+            'epsilon':                          #901811,
+        ),
+        'treehouse-4': (
+            'alpha':                            #0092b2,
+            'beta':                             #046380,
+            'gamma':                            #a8c545,
+            'delta':                            #fff6c5,
+            'epsilon':                          #ffd55c,
+        ),
+        'treehouse-5': (
+            'alpha':                            #dd7e43,
+            'beta':                             #d45c45,
+            'gamma':                            #911146,
+            'delta':                            #9cc264,
+            'epsilon':                          #306e73,
+        ),
+        'treehouse-6': (
+            'alpha':                            #b7ca79,
+            'beta':                             #677e52,
+            'gamma':                            #b0cc99,
+            'delta':                            #89725b,
+            'epsilon':                          #f6e8b1,
+        ),
+    )
+);
+
+$o-palette-priority-prefix: 'treehouse';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'treehouse-1',
+    2: 'treehouse-2',
+    3: 'treehouse-3',
+    4: 'treehouse-4',
+    5: 'treehouse-5',
+    6: 'treehouse-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
 );
diff --git a/theme_treehouse/views/assets.xml b/theme_treehouse/views/assets.xml
deleted file mode 100644
index 530d75b00..000000000
--- a/theme_treehouse/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_treehouse/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_treehouse/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_treehouse/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_treehouse/views/old_snippets/s_images_carousel.xml b/theme_treehouse/views/old_snippets/s_images_carousel.xml
deleted file mode 100644
index 4e48b760b..000000000
--- a/theme_treehouse/views/old_snippets/s_images_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_images_carousel_css_000" inherit_id="theme_common.assets_snippet_s_images_carousel_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_treehouse/static/src/old_snippets/s_images_carousel/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_treehouse/views/old_snippets/s_images_row.xml b/theme_treehouse/views/old_snippets/s_images_row.xml
deleted file mode 100644
index 73c966bfb..000000000
--- a/theme_treehouse/views/old_snippets/s_images_row.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_snippet_s_images_row_css_000" inherit_id="theme_common.assets_snippet_s_images_row_css_000" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_treehouse/static/src/old_snippets/s_images_row/000.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_vehicle/__manifest__.py b/theme_vehicle/__manifest__.py
index 4c351ddfb..b74966892 100644
--- a/theme_vehicle/__manifest__.py
+++ b/theme_vehicle/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
         'views/customizations.xml',
     ],
@@ -18,4 +18,9 @@
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-vehicle.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_vehicle/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_vehicle/data/ir_asset.xml b/theme_vehicle/data/ir_asset.xml
new file mode 100644
index 000000000..f04d1a684
--- /dev/null
+++ b/theme_vehicle/data/ir_asset.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_vehicle.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_vehicle.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_vehicle/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_vehicle.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_vehicle.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_vehicle/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_vehicle/models/theme_vehicle.py b/theme_vehicle/models/theme_vehicle.py
index 630ea3eae..b6f59d3bc 100644
--- a/theme_vehicle/models/theme_vehicle.py
+++ b/theme_vehicle/models/theme_vehicle.py
@@ -6,7 +6,7 @@ class ThemeVehicle(models.AbstractModel):
 
     def _theme_vehicle_post_copy(self, mod):
         # For compatibility
-        # self.enable_view('theme_common.compatibility-saas-10-1')
+        # self.enable_asset('theme_common.compatibility_saas_10_1')
 
         self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_hamburger')
diff --git a/theme_vehicle/static/src/scss/primary_variables.scss b/theme_vehicle/static/src/scss/primary_variables.scss
index 4783e00ba..83a335e1c 100644
--- a/theme_vehicle/static/src/scss/primary_variables.scss
+++ b/theme_vehicle/static/src/scss/primary_variables.scss
@@ -1,87 +1,51 @@
 // Theme colors
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha': #ffffff,
-        'beta': #add3ce,
-        'gamma': #a7c7d5,
-        'delta': #47464b,
-        'epsilon': #f3997b,
-    ),
-    (
-        'alpha': #f8f1d4,
-        'beta': #5b4645,
-        'gamma': #ffffff,
-        'delta': #21263a,
-        'epsilon': #8f8747,
-    ),
-    (
-        'alpha': #dedede,
-        'beta': #adadad,
-        'gamma': #ffffff,
-        'delta': #3e3e3e,
-        'epsilon': #848f47,
-    ),
-    (
-        'alpha': #cfcfcf,
-        'beta': #2e2e2e,
-        'gamma': #ffffff,
-        'delta': #000000,
-        'epsilon': #1ad68f,
-    ),
-    (
-        'alpha': #9fcae2,
-        'beta': #bbc05c,
-        'gamma': #ffffff,
-        'delta': #112625,
-        'epsilon': #45b08c,
-    ),
-    (
-        'alpha': #fdeacc,
-        'beta': #e8cda2,
-        'gamma': #ffffff,
-        'delta': #3e3f43,
-        'epsilon': #e1444d,
-    ),
+        'vehicle-1': (
+            'alpha': #ffffff,
+            'beta': #add3ce,
+            'gamma': #a7c7d5,
+            'delta': #47464b,
+            'epsilon': #f3997b,
+        ),
+        'vehicle-2': (
+            'alpha': #f8f1d4,
+            'beta': #5b4645,
+            'gamma': #ffffff,
+            'delta': #21263a,
+            'epsilon': #8f8747,
+        ),
+        'vehicle-3': (
+            'alpha': #dedede,
+            'beta': #adadad,
+            'gamma': #ffffff,
+            'delta': #3e3e3e,
+            'epsilon': #848f47,
+        ),
+        'vehicle-4': (
+            'alpha': #cfcfcf,
+            'beta': #2e2e2e,
+            'gamma': #ffffff,
+            'delta': #000000,
+            'epsilon': #1ad68f,
+        ),
+        'vehicle-5': (
+            'alpha': #9fcae2,
+            'beta': #bbc05c,
+            'gamma': #ffffff,
+            'delta': #112625,
+            'epsilon': #45b08c,
+        ),
+        'vehicle-6': (
+            'alpha': #fdeacc,
+            'beta': #e8cda2,
+            'gamma': #ffffff,
+            'delta': #3e3f43,
+            'epsilon': #e1444d,
+        ),
+    )
 );
 
-// Grays
-$-gray-700: lighten(#000, 33.5%);
-$o-gray-color-palettes: ();
-@each $-palette in $o-theme-color-palettes {
-    $o-gray-color-palettes: append($o-gray-color-palettes, (
-        '900': lighten(#000000, 20%),
-        '700': $-gray-700,
-        '600': lighten(#000000, 46.7%),
-        '200': lighten(#000000, 85%),
-    ));
-}
-
-$o-color-palettes: (
-    (
-        'o-color-1': #9e160d,
-        'o-color-2': #543b3b,
-        'o-color-3': #f7f6f6,
-        'o-color-4': #ffffff,
-        'o-color-5': #242424,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #3e7ae9,
-        'o-color-2': #000000,
-        'o-color-3': #f3f3f3,
-        'o-color-4': #ffffff,
-        'o-color-5': #222222,
-
-        'menu': 2,
-        'footer': 2,
-        'copyright': 2,
-    ),
-);
-
-
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -169,6 +133,8 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'vehicle-1',
+
         'header-font-size': 1rem,
         'font': 'Droid Sans',
         'headings-font': 'Oswald',
@@ -195,3 +161,36 @@ $o-website-values-palettes: (
         'footer-template': 'minimalist',
     ),
 );
+
+$o-palette-priority-prefix: 'vehicle';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'vehicle-1',
+    2: 'vehicle-2',
+    3: 'generic-1',
+    4: 'generic-2',
+    5: 'generic-3',
+    6: 'generic-4',
+    7: 'generic-5',
+    8: 'generic-6',
+    9: 'generic-7',
+    10: 'generic-8',
+    11: 'generic-9',
+    12: 'generic-10',
+    13: 'generic-11',
+    14: 'generic-12',
+    15: 'generic-13',
+    16: 'generic-14',
+    17: 'generic-15',
+    18: 'generic-16',
+    19: 'generic-17',
+);
+
+$o-theme-color-palettes-compatibility-indexes: (
+    1: 'vehicle-1',
+    2: 'vehicle-2',
+    3: 'vehicle-3',
+    4: 'vehicle-4',
+    5: 'vehicle-5',
+    6: 'vehicle-6',
+);
diff --git a/theme_vehicle/views/assets.xml b/theme_vehicle/views/assets.xml
deleted file mode 100644
index 198d797e4..000000000
--- a/theme_vehicle/views/assets.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_vehicle/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_vehicle/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-
-    <!-- Onboarding Tour -->
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_vehicle/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_yes/__manifest__.py b/theme_yes/__manifest__.py
index 06aaaa17c..6ea44b3cb 100644
--- a/theme_yes/__manifest__.py
+++ b/theme_yes/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common', 'website_animate'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images.xml',
 
         'views/snippets/s_carousel.xml',
@@ -18,13 +18,16 @@
         'views/snippets/s_quotes_carousel.xml',
         'views/snippets/s_call_to_action.xml',
 
-        'views/old_snippets/s_banner_parallax.xml',
-        'views/old_snippets/s_products_carousel.xml',
-    ],
+        ],
     'images': [
         'static/description/yes_description.png',
         'static/description/yes_screenshot.jpg',
     ],
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-yes.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_yes/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_yes/data/ir_asset.xml b/theme_yes/data/ir_asset.xml
new file mode 100644
index 000000000..ee477b1f0
--- /dev/null
+++ b/theme_yes/data/ir_asset.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_yes.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_yes.s_banner_parallax_000_variables_scss</field>
+            <field name="name">Banner parallax 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_yes/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_yes.s_products_carousel_000_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_yes.s_products_carousel_000_variables_scss</field>
+            <field name="name">Products carousel 000 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_yes/static/src/old_snippets/s_products_carousel/000_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="theme_yes.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_yes.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_yes/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_yes.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_yes.compatibility_saas_11_4_variables_scss</field>
+            <field name="name">Compatibility saas 11 4 variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">/theme_yes/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_yes/static/src/scss/primary_variables.scss b/theme_yes/static/src/scss/primary_variables.scss
index 158ffa083..2fbabe47b 100644
--- a/theme_yes/static/src/scss/primary_variables.scss
+++ b/theme_yes/static/src/scss/primary_variables.scss
@@ -1,48 +1,3 @@
-// Colors
-$o-color-palettes: (
-    (
-        'o-color-1': #e991a3,
-        'o-color-2': #575757,
-        'o-color-3': #f6f5f5,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'footer': 1,
-        'copyright': 1,
-    ),
-    (
-        'o-color-1': #f7a58e,
-        'o-color-2': #4b6272,
-        'o-color-3': #ecf0f2,
-        'o-color-4': #ffffff,
-        'o-color-5': #374249,
-
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #f9a646,
-        'o-color-2': #68635d,
-        'o-color-3': #f0efee,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'menu': 4,
-        'footer': 4,
-        'copyright': 4,
-    ),
-    (
-        'o-color-1': #ed6639,
-        'o-color-2': #385b9f,
-        'o-color-3': #d5dee3,
-        'o-color-4': #ffffff,
-        'o-color-5': #333333,
-
-        'footer': 1,
-        'copyright': 4,
-    ),
-);
-
 //------------------------------------------------------------------------------
 // Fonts
 //------------------------------------------------------------------------------
@@ -95,6 +50,7 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'yes-1',
         'font': 'Lora',
         'headings-font': 'Lora',
         'navbar-font': 'Lora',
@@ -106,3 +62,29 @@ $o-website-values-palettes: (
         'fixed-logo-height': 3rem,
     ),
 );
+
+$o-palette-priority-prefix: 'yes';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'yes-1',
+    2: 'yes-2',
+    3: 'yes-3',
+    4: 'yes-4',
+    5: 'generic-1',
+    6: 'generic-2',
+    7: 'generic-3',
+    8: 'generic-4',
+    9: 'generic-5',
+    10: 'generic-6',
+    11: 'generic-7',
+    12: 'generic-8',
+    13: 'generic-9',
+    14: 'generic-10',
+    15: 'generic-11',
+    16: 'generic-12',
+    17: 'generic-13',
+    18: 'generic-14',
+    19: 'generic-15',
+    20: 'generic-16',
+    21: 'generic-17',
+);
diff --git a/theme_yes/views/assets.xml b/theme_yes/views/assets.xml
deleted file mode 100644
index 6c4da29fd..000000000
--- a/theme_yes/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_yes/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="compatibility-saas-11-4-variables" name="Compatibility for saas-11.4 (variables)" inherit_id="theme_common.compatibility-saas-11-4-variables">
-        <xpath expr="//link[last()]" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_yes/static/src/scss/compatibility-saas-11.4-variables.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_yes/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_yes/views/old_snippets/s_banner_parallax.xml b/theme_yes/views/old_snippets/s_banner_parallax.xml
deleted file mode 100644
index 4c94f4121..000000000
--- a/theme_yes/views/old_snippets/s_banner_parallax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_banner_parallax_css_000_variables" inherit_id="theme_common._assets_snippet_s_banner_parallax_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_yes/static/src/old_snippets/s_banner_parallax/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_yes/views/old_snippets/s_products_carousel.xml b/theme_yes/views/old_snippets/s_products_carousel.xml
deleted file mode 100644
index a57883590..000000000
--- a/theme_yes/views/old_snippets/s_products_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="_assets_snippet_s_products_carousel_css_000_variables" inherit_id="theme_common._assets_snippet_s_products_carousel_css_000_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/theme_yes/static/src/old_snippets/s_products_carousel/000_variables.scss"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_zap/__manifest__.py b/theme_zap/__manifest__.py
index e29f0e708..ec1acba51 100644
--- a/theme_zap/__manifest__.py
+++ b/theme_zap/__manifest__.py
@@ -8,7 +8,7 @@
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
-        'views/assets.xml',
+        'data/ir_asset.xml',
         'views/images_library.xml',
 
         'views/snippets/s_banner.xml',
@@ -23,5 +23,10 @@
         'static/description/zap_screenshot.jpg',
     ],
     'license': 'LGPL-3',
-    'live_test_url': 'https://theme-zap.odoo.com'
+    'live_test_url': 'https://theme-zap.odoo.com',
+    'assets': {
+        'website.assets_editor': [
+            'theme_zap/static/src/js/tour.js',
+        ],
+    }
 }
diff --git a/theme_zap/data/ir_asset.xml b/theme_zap/data/ir_asset.xml
new file mode 100644
index 000000000..d139a3b96
--- /dev/null
+++ b/theme_zap/data/ir_asset.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="theme_zap.primary_variables_scss" model="theme.ir.asset">
+            <field name="key">theme_zap.primary_variables_scss</field>
+            <field name="name">Primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">theme_zap/static/src/scss/primary_variables.scss</field>
+        </record>
+
+        <record id="theme_zap.bootstrap_overridden_scss" model="theme.ir.asset">
+            <field name="key">theme_zap.bootstrap_overridden_scss</field>
+            <field name="name">Bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">theme_zap/static/src/scss/bootstrap_overridden.scss</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/theme_zap/models/theme_zap.py b/theme_zap/models/theme_zap.py
index 7c6af1c26..74592560d 100644
--- a/theme_zap/models/theme_zap.py
+++ b/theme_zap/models/theme_zap.py
@@ -12,4 +12,5 @@ class ThemeZap(models.AbstractModel):
         self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_links')
 
-        self.enable_view('website.option_ripple_effect')
+        self.enable_asset('website.ripple_effect_scss')
+        self.enable_asset('website.ripple_effect_js')
diff --git a/theme_zap/static/src/scss/primary_variables.scss b/theme_zap/static/src/scss/primary_variables.scss
index 474618097..db51c2431 100644
--- a/theme_zap/static/src/scss/primary_variables.scss
+++ b/theme_zap/static/src/scss/primary_variables.scss
@@ -4,6 +4,7 @@
 
 $o-website-values-palettes: (
     (
+        'color-palettes-name': 'zap-1',
         // Header
         'header-template':                  'hamburger',
         'logo-height':                      2.75rem,
@@ -114,157 +115,78 @@ $o-theme-btn-font-weight:                   400;
 // Colors
 //------------------------------------------------------------------------------//
 
-$o-color-palettes: (
-    ( // Palette 1
-        'o-color-1':                        #337ab7,
-        'o-color-2':                        #5cb85c,
-        'o-color-3':                        #eceef1,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #1d2127,
-
-        'o-cc1-text':                       'o-color-5',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc5-headings':                   'o-color-1',
-
-        'menu':                             2,
-        'footer':                           2,
-        'copyright':                        4,
-    ),
-    ( // Palette 2
-        'o-color-1':                        #ed8c2b,
-        'o-color-2':                        #a8c545,
-        'o-color-3':                        #8e3557,
-        'o-color-4':                        #efecca,
-        'o-color-5':                        #35203b,
-
-        'o-cc1-bg':                         #ffffff,
-        'o-cc1-text':                       #1d2127,
-        'o-cc3-link':                       'o-color-4',
-        'o-cc3-btn-primary':                'o-color-5',
-        'o-cc4-link':                       'o-color-4',
-
-        'menu':                             5,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-    ( // Palette 3
-        'o-color-1':                        #79bd8f,
-        'o-color-2':                        #046380,
-        'o-color-3':                        #beeb9f,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #000000,
-
-        'o-cc1-text':                       #222222,
-        'o-cc2-headings':                   'o-color-2',
-        'o-cc2-link':                       'o-color-2',
-        'o-cc4-link':                       'o-color-4',
-        'o-cc5-headings':                   'o-color-3',
-        'o-cc5-link':                       'o-color-3',
-
-        'menu':                             1,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-    ( // Palette 4
-        'o-color-1':                        #00b3c5,
-        'o-color-2':                        #d72d3c,
-        'o-color-3':                        #ebeef1,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #000000,
-
-        'o-cc1-text':                       #1d2127,
-        'o-cc2-headings':                   'o-cc1-text',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc4-link':                       'o-color-4',
-
-        'menu':                             2,
-        'footer':                           2,
-        'copyright':                        4,
-    ),
-    ( // Palette 5
-        'o-color-1':                        #413659,
-        'o-color-2':                        #c9de55,
-        'o-color-3':                        #bdd4de,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #14212b,
-
-        'o-cc1-text':                       'o-color-5',
-        'o-cc2-btn-secondary':              'o-color-4',
-        'o-cc3-btn-secondary':              'o-color-4',
-        'o-cc4-btn-primary':                'o-color-2',
-        'o-cc4-btn-secondary':              'o-color-4',
-        'o-cc4-link':                       'o-color-3',
-        'o-cc5-headings':                   'o-color-2',
-        'o-cc5-btn-primary':                'o-color-4',
-        'o-cc5-btn-secondary':              'o-color-2',
-        'o-cc5-link':                       'o-color-3',
-
-        'menu':                             2,
-        'footer':                           2,
-        'copyright':                        4,
-    ),
-    ( // Palette 6
-        'o-color-1':                        #F25244,
-        'o-color-2':                        #45858C,
-        'o-color-3':                        #e8f1ff,
-        'o-color-4':                        #ffffff,
-        'o-color-5':                        #000000,
-
-        'o-cc1-text':                       #323a49,
-        'o-cc2-headings':                   'o-cc1-text',
-        'o-cc3-link':                       'o-color-4',
-        'o-cc3-btn-primary':                'o-color-5',
-        'o-cc4-link':                       'o-color-4',
-
-        'menu':                             2,
-        'footer':                           5,
-        'copyright':                        4,
-    ),
-);
-
 // Compatibility
-$o-theme-color-palettes: (
+$o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
-        'alpha':                            #337ab7,
-        'beta':                             #5cb85c,
-        'gamma':                            #5bc0de,
-        'delta':                            #f0ad4e,
-        'epsilon':                          #d9534f,
-    ),
-    (
-        'alpha':                            #ed8c2b,
-        'beta':                             #cf4a30,
-        'gamma':                            #911146,
-        'delta':                            #35203b,
-        'epsilon':                          #88a825,
-    ),
-    (
-        'alpha':                            #79bd8f,
-        'beta':                             #00a388,
-        'gamma':                            #046380,
-        'delta':                            #4bb5c1,
-        'epsilon':                          #beeb9f,
-    ),
-    (
-        'alpha':                            #16c6cc,
-        'beta':                             #d72d3C,
-        'gamma':                            #ff6d3b,
-        'delta':                            #ffb733,
-        'epsilon':                          #ffd55c,
-    ),
-    (
-        'alpha':                            #14212b,
-        'beta':                             #e6e2af,
-        'gamma':                            #c9de55,
-        'delta':                            #962d3e,
-        'epsilon':                          #413659,
-    ),
-    (
-        'alpha':                            #ee592f,
-        'beta':                             #59c1b0,
-        'gamma':                            #1fa58d,
-        'delta':                            #f8c63b,
-        'epsilon':                          #dcb038,
-    ),
+        'zap-1': (
+            'alpha':                            #337ab7,
+            'beta':                             #5cb85c,
+            'gamma':                            #5bc0de,
+            'delta':                            #f0ad4e,
+            'epsilon':                          #d9534f,
+        ),
+        'zap-2': (
+            'alpha':                            #ed8c2b,
+            'beta':                             #cf4a30,
+            'gamma':                            #911146,
+            'delta':                            #35203b,
+            'epsilon':                          #88a825,
+        ),
+        'zap-3': (
+            'alpha':                            #79bd8f,
+            'beta':                             #00a388,
+            'gamma':                            #046380,
+            'delta':                            #4bb5c1,
+            'epsilon':                          #beeb9f,
+        ),
+        'zap-4': (
+            'alpha':                            #16c6cc,
+            'beta':                             #d72d3C,
+            'gamma':                            #ff6d3b,
+            'delta':                            #ffb733,
+            'epsilon':                          #ffd55c,
+        ),
+        'zap-5': (
+            'alpha':                            #14212b,
+            'beta':                             #e6e2af,
+            'gamma':                            #c9de55,
+            'delta':                            #962d3e,
+            'epsilon':                          #413659,
+        ),
+        'zap-6': (
+            'alpha':                            #ee592f,
+            'beta':                             #59c1b0,
+            'gamma':                            #1fa58d,
+            'delta':                            #f8c63b,
+            'epsilon':                          #dcb038,
+        ),
+    )
+);
+
+$o-palette-priority-prefix: 'zap';
+
+$o-color-palettes-compatibility-indexes: (
+    1: 'zap-1',
+    2: 'zap-2',
+    3: 'zap-3',
+    4: 'zap-4',
+    5: 'zap-5',
+    6: 'zap-6',
+    7: 'generic-1',
+    8: 'generic-2',
+    9: 'generic-3',
+    10: 'generic-4',
+    11: 'generic-5',
+    12: 'generic-6',
+    13: 'generic-7',
+    14: 'generic-8',
+    15: 'generic-9',
+    16: 'generic-10',
+    17: 'generic-11',
+    18: 'generic-12',
+    19: 'generic-13',
+    20: 'generic-14',
+    21: 'generic-15',
+    22: 'generic-16',
+    23: 'generic-17',
 );
diff --git a/theme_zap/views/assets.xml b/theme_zap/views/assets.xml
deleted file mode 100644
index 123b4c067..000000000
--- a/theme_zap/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables" priority="1">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/theme_zap/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="website._assets_frontend_helpers" priority="1">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/theme_zap/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/theme_zap/static/src/js/tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/website_animate/__manifest__.py b/website_animate/__manifest__.py
index b5b7cb760..cfc9a91c0 100644
--- a/website_animate/__manifest__.py
+++ b/website_animate/__manifest__.py
@@ -5,11 +5,19 @@
     'version':'1.1',
     'author':'Odoo S.A.',
     'data': [
-        'views/assets.xml',
         'views/options.xml',
     ],
     'depends': ['website'],
     'images': [
         'static/description/icon.png',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'website_animate/static/src/scss/o_animate_frontend.scss',
+            'website_animate/static/src/js/o_animate.frontend.js',
+        ],
+        'website.assets_editor': [
+            'website_animate/static/src/js/o_animate.editor.js',
+        ],
+    }
 }
diff --git a/website_animate/views/assets.xml b/website_animate/views/assets.xml
deleted file mode 100644
index 19bc0aec3..000000000
--- a/website_animate/views/assets.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="o_animate_assets_frontend_js" inherit_id="website.assets_frontend">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_animate/static/src/scss/o_animate_frontend.scss"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_animate/static/src/js/o_animate.frontend.js"/>
-        </xpath>
-    </template>
-
-    <template id="o_animate_assets_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_animate/static/src/js/o_animate.editor.js"/>
-        </xpath>
-    </template>
-</odoo>