diff --git a/theme_artists/views/snippets/s_product_catalog.xml b/theme_artists/views/snippets/s_product_catalog.xml
index a93ffe6dc9..3b32a75664 100644
--- a/theme_artists/views/snippets/s_product_catalog.xml
+++ b/theme_artists/views/snippets/s_product_catalog.xml
@@ -21,21 +21,18 @@
     <!-- List -->
     <xpath expr="//div[hasclass('col-lg-6')]/ul[hasclass('list-unstyled')]" position="replace">
         <ul class="list-unstyled my-3">
-            <t t-call="website.s_product_catalog_dish">
-                <t t-set="name">New York</t>
-                <t t-set="price">02.08.2025</t>
-                <t t-set="description">The Museum of Modern Art (MoMA)</t>
-            </t>
-            <t t-call="website.s_product_catalog_dish">
-                <t t-set="name">Paris</t>
-                <t t-set="price">09.09.2025</t>
-                <t t-set="description">Digital Art Paris</t>
-            </t>
-            <t t-call="website.s_product_catalog_dish">
-                <t t-set="name">Brussels</t>
-                <t t-set="price">12.11.2025</t>
-                <t t-set="description">Royal Museums of Fine Arts of Belgium</t>
-            </t>
+            <t t-call="website.s_product_catalog_dish"
+                name.translate="New York"
+                price.translate="02.08.2025"
+                description.translate="The Museum of Modern Art (MoMA)"/>
+            <t t-call="website.s_product_catalog_dish"
+                name.translate="Paris"
+                price.translate="09.09.2025"
+                description.translate="Digital Art Paris"/>
+            <t t-call="website.s_product_catalog_dish"
+                name.translate="Brussels"
+                price.translate="12.11.2025"
+                description.translate="Royal Museums of Fine Arts of Belgium"/>
         </ul>
     </xpath>
     <!-- Title -->
@@ -43,21 +40,18 @@
     <!-- List -->
     <xpath expr="//div[hasclass('col-lg-6')][2]/ul[hasclass('list-unstyled')]" position="replace">
         <ul class="list-unstyled my-3">
-            <t t-call="website.s_product_catalog_dish">
-                <t t-set="name">Amsterdam</t>
-                <t t-set="price">02.08.2025</t>
-                <t t-set="description">Comput'Art</t>
-            </t>
-            <t t-call="website.s_product_catalog_dish">
-                <t t-set="name">Berlin</t>
-                <t t-set="price">12.12.2025</t>
-                <t t-set="description">Berlin Art Week</t>
-            </t>
-            <t t-call="website.s_product_catalog_dish">
-                <t t-set="name">London</t>
-                <t t-set="price">03.01.2026</t>
-                <t t-set="description">Abstract Vision</t>
-            </t>
+            <t t-call="website.s_product_catalog_dish"
+                name.translate="Amsterdam"
+                price.translate="02.08.2025"
+                description.translate="Comput'Art"/>
+            <t t-call="website.s_product_catalog_dish"
+                name.translate="Berlin"
+                price.translate="12.12.2025"
+                description.translate="Berlin Art Week"/>
+            <t t-call="website.s_product_catalog_dish"
+                name.translate="London"
+                price.translate="03.01.2026"
+                description.translate="Abstract Vision"/>
         </ul>
     </xpath>
 </template>
diff --git a/theme_notes/views/snippets/s_product_catalog.xml b/theme_notes/views/snippets/s_product_catalog.xml
index fa8a076971..a6527457a7 100644
--- a/theme_notes/views/snippets/s_product_catalog.xml
+++ b/theme_notes/views/snippets/s_product_catalog.xml
@@ -30,45 +30,33 @@
     <xpath expr="//div[hasclass('container')]//p" position="replace" mode="inner">
         Get your ticket now
     </xpath>
-    <!-- Left column : names -->
-    <xpath expr="//ul/t/t" position="replace" mode="inner">
-        Regular ticket
-    </xpath>
-    <xpath expr="//ul/t[2]/t" position="replace" mode="inner">
-        Regular ticket + hotel
-    </xpath>
-    <xpath expr="//ul/t[3]/t" position="replace" mode="inner">
-        VIP ticket
-    </xpath>
-    <!-- Left column : prices -->
-    <xpath expr="//ul/t/t[2]" position="replace" mode="inner">
-        $19.00
-    </xpath>
-    <xpath expr="//ul/t[2]/t[2]" position="replace" mode="inner">
-        $59.00
-    </xpath>
-    <xpath expr="//ul/t[3]/t[2]" position="replace" mode="inner">
-        $109.50
-    </xpath>
-    <!-- Right column : names -->
-    <xpath expr="(//ul)[2]/t/t" position="replace" mode="inner">
-        Regular ticket
-    </xpath>
-    <xpath expr="(//ul)[2]/t[2]/t" position="replace" mode="inner">
-        Regular ticket + hotel
-    </xpath>
-    <xpath expr="(//ul)[2]/t[3]/t" position="replace" mode="inner">
-        VIP ticket
+
+    <!-- Left column -->
+    <xpath expr="//ul/t" position="attributes">
+        <attribute name="name.translate">Regular ticket</attribute>
+        <attribute name="price.translate">$19.00</attribute>
     </xpath>
-    <!-- Right column : prices -->
-    <xpath expr="(//ul)[2]//t[2]" position="replace" mode="inner">
-        $25.00
+    <xpath expr="//ul/t[2]" position="attributes">
+        <attribute name="name.translate">Regular ticket + hotel</attribute>
+        <attribute name="price.translate">$59.00</attribute>
     </xpath>
-    <xpath expr="(//ul)[2]/t[2]/t[2]" position="replace" mode="inner">
-        $65.00
+    <xpath expr="//ul/t[3]" position="attributes">
+        <attribute name="name.translate">VIP ticket</attribute>
+        <attribute name="price.translate">$109.50</attribute>
     </xpath>
-    <xpath expr="(//ul)[2]/t[3]/t[2]" position="replace" mode="inner">
-        $115.50
+
+    <!-- Left column -->
+    <xpath expr="(//ul)[2]/t" position="attributes">
+        <attribute name="name.translate">Regular ticket</attribute>
+        <attribute name="price.translate">$25.00</attribute>
+    </xpath>
+    <xpath expr="(//ul)[2]/t[2]" position="attributes">
+        <attribute name="name.translate">Regular ticket + hotel</attribute>
+        <attribute name="price.translate">$65.00</attribute>
+    </xpath>
+    <xpath expr="(//ul)[2]/t[3]" position="attributes">
+        <attribute name="name.translate">VIP ticket</attribute>
+        <attribute name="price.translate">$115.50</attribute>
     </xpath>
 </template>
 
diff --git a/theme_test_custo/views/header.xml b/theme_test_custo/views/header.xml
index b719a14b12..efdf170ff1 100644
--- a/theme_test_custo/views/header.xml
+++ b/theme_test_custo/views/header.xml
@@ -10,22 +10,17 @@
                 <t t-call="website.navbar_nav">
                     <!-- Menu -->
                     <t t-foreach="website.menu_id.child_id" t-as="submenu">
-                        <t t-call="website.submenu">
-                            <t t-set="item_class" t-valuef="nav-item"/>
-                            <t t-set="link_class" t-valuef="nav-link"/>
-                        </t>
+                        <t t-call="website.submenu" item_class.f="nav-item" link_class.f="nav-link"/>
                     </t>
                     <!-- Sign In -->
-                    <t t-call="portal.placeholder_user_sign_in">
-                        <t t-set="_item_class" t-valuef="nav-item"/>
-                        <t t-set="_link_class" t-valuef="nav-link text-900"/>
-                    </t>
+                    <t t-call="portal.placeholder_user_sign_in"
+                        _item_class.f="nav-item"
+                        _link_class.f="nav-link text-900"/>
                     <!-- User Dropdown -->
-                    <t t-call="portal.user_dropdown">
-                        <t t-set="_user_name" t-value="true"/>
-                        <t t-set="_item_class" t-valuef="nav-item dropdown ml-auto"/>
-                        <t t-set="_link_class" t-valuef="nav-link text-900"/>
-                    </t>
+                    <t t-call="portal.user_dropdown"
+                        _user_name="true"
+                        _item_class.f="nav-item dropdown ml-auto"
+                        _link_class.f="nav-link text-900"/>
                 </t>
             </div>
         </nav>