diff --git a/components/footer/ColorClasses.tsx b/components/footer/ColorClasses.tsx
deleted file mode 100644
index 1d640781..00000000
--- a/components/footer/ColorClasses.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-export interface Layout {
-  backgroundColor?:
-    | "Primary"
-    | "Secondary"
-    | "Accent"
-    | "Base 100"
-    | "Base 100 inverted";
-  variation?:
-    | "Variation 1"
-    | "Variation 2"
-    | "Variation 3"
-    | "Variation 4"
-    | "Variation 5";
-  hide?: {
-    logo?: boolean;
-    newsletter?: boolean;
-    sectionLinks?: boolean;
-    socialLinks?: boolean;
-    paymentMethods?: boolean;
-    mobileApps?: boolean;
-    regionOptions?: boolean;
-    extraLinks?: boolean;
-    backToTheTop?: boolean;
-  };
-}
-
-export default function colorClasses(layout: Layout) {
-  switch (layout?.backgroundColor) {
-    case "Primary":
-      return "bg-primary text-primary-content";
-    case "Secondary":
-      return "bg-secondary text-secondary-content";
-    case "Accent":
-      return "bg-accent text-accent-content";
-    case "Base 100":
-      return "bg-base-100 text-base-content";
-    case "Base 100 inverted":
-      return "bg-base-content text-base-100";
-    default:
-      return "bg-primary text-primary-content";
-  }
-}
diff --git a/components/footer/Footer.tsx b/components/footer/Footer.tsx
index 8a9078ef..789f4679 100644
--- a/components/footer/Footer.tsx
+++ b/components/footer/Footer.tsx
@@ -1,5 +1,4 @@
 import BackToTop from "$store/components/footer/BackToTop.tsx";
-import ColorClasses from "$store/components/footer/ColorClasses.tsx";
 import Divider from "$store/components/footer/Divider.tsx";
 import ExtraLinks from "$store/components/footer/ExtraLinks.tsx";
 import FooterItems from "$store/components/footer/FooterItems.tsx";
@@ -9,6 +8,7 @@ import PaymentMethods from "$store/components/footer/PaymentMethods.tsx";
 import RegionSelector from "$store/components/footer/RegionSelector.tsx";
 import Social from "$store/components/footer/Social.tsx";
 import Newsletter from "$store/islands/Newsletter.tsx";
+import { clx } from "$store/sdk/clx.ts";
 import type { ImageWidget } from "apps/admin/widgets.ts";
 import PoweredByDeco from "apps/website/components/PoweredByDeco.tsx";
 
@@ -111,6 +111,14 @@ export interface Props {
   layout?: Layout;
 }
 
+const LAYOUT = {
+  "Primary": "bg-primary text-primary-content",
+  "Secondary": "bg-secondary text-secondary-content",
+  "Accent": "bg-accent text-accent-content",
+  "Base 100": "bg-base-100 text-base-content",
+  "Base 100 inverted": "bg-base-content text-base-100",
+};
+
 function Footer({
   logo,
   newsletter = {
@@ -214,9 +222,10 @@ function Footer({
 
   return (
     <footer
-      class={`w-full flex flex-col pt-10 pb-2 md:pb-10 gap-10 ${
-        ColorClasses(layout)
-      }`}
+      class={clx(
+        "w-full flex flex-col pt-10 pb-2 md:pb-10 gap-10",
+        LAYOUT[layout?.backgroundColor ?? "Primary"],
+      )}
     >
       <div class="lg:container mx-6 lg:mx-auto">
         {(!layout?.variation || layout?.variation == "Variation 1") && (
diff --git a/components/footer/Newsletter.tsx b/components/footer/Newsletter.tsx
index bc843748..e5bc161e 100644
--- a/components/footer/Newsletter.tsx
+++ b/components/footer/Newsletter.tsx
@@ -1,5 +1,6 @@
-import { useSignal } from "@preact/signals";
 import { invoke } from "$store/runtime.ts";
+import { clx } from "$store/sdk/clx.ts";
+import { useSignal } from "@preact/signals";
 import type { JSX } from "preact";
 
 export interface Form {
@@ -44,11 +45,10 @@ function Newsletter(
 
   return (
     <div
-      class={`flex ${
-        tiled
-          ? "flex-col gap-4 lg:flex-row lg:w-full lg:justify-between"
-          : "flex-col gap-4"
-      }`}
+      class={clx(
+        "flex flex-col gap-4",
+        tiled && "lg:flex-row lg:w-full lg:justify-between",
+      )}
     >
       <div class="flex flex-col gap-4">
         {content?.title && (
diff --git a/components/ui/Button.tsx b/components/ui/Button.tsx
index a43f2908..f828924e 100644
--- a/components/ui/Button.tsx
+++ b/components/ui/Button.tsx
@@ -21,7 +21,7 @@ const Button = forwardRef<HTMLButtonElement, Props>(({
     {...props}
     className={`btn no-animation ${_class}`}
     disabled={disabled || loading}
-    aria-label={ariaLabel}
+    aria-label={ariaLabel || props["aria-label"]}
     type={type}
     ref={ref}
   >
diff --git a/components/ui/SectionHeader.tsx b/components/ui/SectionHeader.tsx
index 2c6a93d8..ed08e086 100644
--- a/components/ui/SectionHeader.tsx
+++ b/components/ui/SectionHeader.tsx
@@ -1,3 +1,5 @@
+import { clx } from "$store/sdk/clx.ts";
+
 export interface Props {
   title?: string;
   fontSize?: "Small" | "Normal" | "Large";
@@ -25,14 +27,13 @@ function Header(props: Props) {
             {props.title &&
               (
                 <h1
-                  class={`text-2xl font-light leading-8 lg:leading-10
-                  ${
+                  class={clx(
+                    "text-2xl font-light leading-8 lg:leading-10",
                     props.colorReverse
                       ? "text-primary-content"
-                      : "text-base-content"
-                  }
-                  ${fontSizeClasses[props.fontSize || "Normal"]}
-                `}
+                      : "text-base-content",
+                    fontSizeClasses[props.fontSize || "Normal"],
+                  )}
                 >
                   {props.title}
                 </h1>
@@ -40,15 +41,13 @@ function Header(props: Props) {
             {props.description &&
               (
                 <h2
-                  class={`
-                  leading-6 lg:leading-8
-                  ${
+                  class={clx(
+                    "leading-6 lg:leading-8",
                     props.colorReverse
                       ? "text-primary-content"
-                      : "text-base-content"
-                  }
-                  ${fontSizeClasses[props.fontSize || "Normal"]}
-                `}
+                      : "text-base-content",
+                    fontSizeClasses[props.fontSize || "Normal"],
+                  )}
                 >
                   {props.description}
                 </h2>
diff --git a/deno.json b/deno.json
index 0e72352f..9cb3a6d1 100644
--- a/deno.json
+++ b/deno.json
@@ -1,8 +1,8 @@
 {
   "imports": {
     "$store/": "./",
-    "deco/": "https://denopkg.com/deco-cx/deco@1.54.0/",
-    "apps/": "https://denopkg.com/deco-cx/apps@0.33.0/",
+    "deco/": "https://denopkg.com/deco-cx/deco@1.55.0/",
+    "apps/": "https://denopkg.com/deco-cx/apps@0.34.0/",
     "$fresh/": "https://deno.land/x/fresh@1.6.3/",
     "preact": "https://esm.sh/preact@10.19.2",
     "preact/": "https://esm.sh/preact@10.19.2/",
diff --git a/manifest.gen.ts b/manifest.gen.ts
index c360bf65..593c62e4 100644
--- a/manifest.gen.ts
+++ b/manifest.gen.ts
@@ -2,62 +2,62 @@
 // This file SHOULD be checked into source version control.
 // This file is automatically updated during development when running `dev.ts`.
 
+import * as $$$$$$$$$$$0 from "./apps/decohub.ts";
+import * as $$$$$$$$$$$1 from "./apps/site.ts";
 import * as $$$0 from "./loaders/Layouts/ProductCard.tsx";
 import * as $$$1 from "./loaders/List/Sections.tsx";
-import * as $$$$$$0 from "./sections/Gallery.tsx";
-import * as $$$$$$1 from "./sections/Footer/Footer.tsx";
-import * as $$$$$$2 from "./sections/Category/CategoryBanner.tsx";
-import * as $$$$$$3 from "./sections/Category/CategoryList.tsx";
-import * as $$$$$$4 from "./sections/Category/CategoryGrid.tsx";
-import * as $$$$$$5 from "./sections/Images/ShoppableBanner.tsx";
-import * as $$$$$$6 from "./sections/Images/BannerGrid.tsx";
-import * as $$$$$$7 from "./sections/Images/ImageGallery.tsx";
-import * as $$$$$$8 from "./sections/Images/Carousel.tsx";
-import * as $$$$$$9 from "./sections/Layout/Container.tsx";
-import * as $$$$$$10 from "./sections/Layout/Grid.tsx";
-import * as $$$$$$11 from "./sections/Layout/Flex.tsx";
-import * as $$$$$$12 from "./sections/Layout/GridItem.tsx";
-import * as $$$$$$13 from "./sections/Cards/ImageCardsCarousel.tsx";
-import * as $$$$$$14 from "./sections/Cards/IconCardsCarouselWithImage.tsx";
-import * as $$$$$$15 from "./sections/Cards/ImageCardsCarouselWithImage.tsx";
-import * as $$$$$$16 from "./sections/Cards/IconCardsCarousel.tsx";
-import * as $$$$$$17 from "./sections/Animation/Animation.tsx";
-import * as $$$$$$18 from "./sections/Content/Hero.tsx";
-import * as $$$$$$19 from "./sections/Content/Features.tsx";
-import * as $$$$$$20 from "./sections/Content/Intro.tsx";
-import * as $$$$$$21 from "./sections/Content/BlogPosts.tsx";
-import * as $$$$$$22 from "./sections/Content/TextWithImage.tsx";
-import * as $$$$$$23 from "./sections/Content/RichText.tsx";
-import * as $$$$$$24 from "./sections/Content/Partners.tsx";
-import * as $$$$$$25 from "./sections/Content/Testimonials.tsx";
-import * as $$$$$$26 from "./sections/Content/Logos.tsx";
-import * as $$$$$$27 from "./sections/Content/CallToAction.tsx";
-import * as $$$$$$28 from "./sections/Content/Table.tsx";
-import * as $$$$$$29 from "./sections/Content/Faq.tsx";
-import * as $$$$$$30 from "./sections/Content/Benefits.tsx";
-import * as $$$$$$31 from "./sections/Content/ImageSection.tsx";
-import * as $$$$$$32 from "./sections/Product/Wishlist.tsx";
-import * as $$$$$$33 from "./sections/Product/NotFoundChallenge.tsx";
-import * as $$$$$$34 from "./sections/Product/SearchResult.tsx";
-import * as $$$$$$35 from "./sections/Product/ProductInfo.tsx";
-import * as $$$$$$36 from "./sections/Product/ProductShelf.tsx";
-import * as $$$$$$37 from "./sections/Product/ImageGallerySlider.tsx";
-import * as $$$$$$38 from "./sections/Product/ImageGalleryFrontBack.tsx";
-import * as $$$$$$39 from "./sections/Product/ShelfWithImage.tsx";
-import * as $$$$$$40 from "./sections/Product/ProductShelfTabbed.tsx";
+import * as $$$$$$0 from "./sections/Animation/Animation.tsx";
+import * as $$$$$$1 from "./sections/Cards/IconCardsCarousel.tsx";
+import * as $$$$$$2 from "./sections/Cards/IconCardsCarouselWithImage.tsx";
+import * as $$$$$$3 from "./sections/Cards/ImageCardsCarousel.tsx";
+import * as $$$$$$4 from "./sections/Cards/ImageCardsCarouselWithImage.tsx";
+import * as $$$$$$5 from "./sections/Category/CategoryBanner.tsx";
+import * as $$$$$$6 from "./sections/Category/CategoryGrid.tsx";
+import * as $$$$$$7 from "./sections/Category/CategoryList.tsx";
+import * as $$$$$$8 from "./sections/Content/Benefits.tsx";
+import * as $$$$$$9 from "./sections/Content/BlogPosts.tsx";
+import * as $$$$$$10 from "./sections/Content/CallToAction.tsx";
+import * as $$$$$$11 from "./sections/Content/Faq.tsx";
+import * as $$$$$$12 from "./sections/Content/Features.tsx";
+import * as $$$$$$13 from "./sections/Content/Hero.tsx";
+import * as $$$$$$14 from "./sections/Content/ImageSection.tsx";
+import * as $$$$$$15 from "./sections/Content/Intro.tsx";
+import * as $$$$$$16 from "./sections/Content/Logos.tsx";
+import * as $$$$$$17 from "./sections/Content/Partners.tsx";
+import * as $$$$$$18 from "./sections/Content/RichText.tsx";
+import * as $$$$$$19 from "./sections/Content/Table.tsx";
+import * as $$$$$$20 from "./sections/Content/Testimonials.tsx";
+import * as $$$$$$21 from "./sections/Content/TextWithImage.tsx";
+import * as $$$$$$22 from "./sections/Footer/Footer.tsx";
+import * as $$$$$$23 from "./sections/Gallery.tsx";
+import * as $$$$$$24 from "./sections/Header/Header.tsx";
+import * as $$$$$$25 from "./sections/Images/BannerGrid.tsx";
+import * as $$$$$$26 from "./sections/Images/Carousel.tsx";
+import * as $$$$$$27 from "./sections/Images/ImageGallery.tsx";
+import * as $$$$$$28 from "./sections/Images/ShoppableBanner.tsx";
+import * as $$$$$$29 from "./sections/Layout/Container.tsx";
+import * as $$$$$$30 from "./sections/Layout/Flex.tsx";
+import * as $$$$$$31 from "./sections/Layout/Grid.tsx";
+import * as $$$$$$32 from "./sections/Layout/GridItem.tsx";
+import * as $$$$$$33 from "./sections/Links/LinkTree.tsx";
+import * as $$$$$$34 from "./sections/Links/Shortcuts.tsx";
+import * as $$$$$$35 from "./sections/Miscellaneous/CampaignTimer.tsx";
+import * as $$$$$$36 from "./sections/Miscellaneous/CookieConsent.tsx";
+import * as $$$$$$37 from "./sections/Miscellaneous/Slide.tsx";
+import * as $$$$$$38 from "./sections/Newsletter/Newsletter.tsx";
+import * as $$$$$$39 from "./sections/Product/ImageGalleryFrontBack.tsx";
+import * as $$$$$$40 from "./sections/Product/ImageGallerySlider.tsx";
 import * as $$$$$$41 from "./sections/Product/NotFound.tsx";
-import * as $$$$$$42 from "./sections/Miscellaneous/CampaignTimer.tsx";
-import * as $$$$$$43 from "./sections/Miscellaneous/CookieConsent.tsx";
-import * as $$$$$$44 from "./sections/Miscellaneous/Slide.tsx";
-import * as $$$$$$45 from "./sections/Social/WhatsApp.tsx";
-import * as $$$$$$46 from "./sections/Social/InstagramPosts.tsx";
-import * as $$$$$$47 from "./sections/Theme/Theme.tsx";
-import * as $$$$$$48 from "./sections/Links/LinkTree.tsx";
-import * as $$$$$$49 from "./sections/Links/Shortcuts.tsx";
-import * as $$$$$$50 from "./sections/Newsletter/Newsletter.tsx";
-import * as $$$$$$51 from "./sections/Header/Header.tsx";
-import * as $$$$$$$$$$$0 from "./apps/decohub.ts";
-import * as $$$$$$$$$$$1 from "./apps/site.ts";
+import * as $$$$$$42 from "./sections/Product/NotFoundChallenge.tsx";
+import * as $$$$$$43 from "./sections/Product/ProductInfo.tsx";
+import * as $$$$$$44 from "./sections/Product/ProductShelf.tsx";
+import * as $$$$$$45 from "./sections/Product/ProductShelfTabbed.tsx";
+import * as $$$$$$46 from "./sections/Product/SearchResult.tsx";
+import * as $$$$$$47 from "./sections/Product/ShelfWithImage.tsx";
+import * as $$$$$$48 from "./sections/Product/Wishlist.tsx";
+import * as $$$$$$49 from "./sections/Social/InstagramPosts.tsx";
+import * as $$$$$$50 from "./sections/Social/WhatsApp.tsx";
+import * as $$$$$$51 from "./sections/Theme/Theme.tsx";
 
 const manifest = {
   "loaders": {
@@ -65,61 +65,61 @@ const manifest = {
     "deco-sites/storefront/loaders/List/Sections.tsx": $$$1,
   },
   "sections": {
-    "deco-sites/storefront/sections/Animation/Animation.tsx": $$$$$$17,
-    "deco-sites/storefront/sections/Cards/IconCardsCarousel.tsx": $$$$$$16,
+    "deco-sites/storefront/sections/Animation/Animation.tsx": $$$$$$0,
+    "deco-sites/storefront/sections/Cards/IconCardsCarousel.tsx": $$$$$$1,
     "deco-sites/storefront/sections/Cards/IconCardsCarouselWithImage.tsx":
-      $$$$$$14,
-    "deco-sites/storefront/sections/Cards/ImageCardsCarousel.tsx": $$$$$$13,
+      $$$$$$2,
+    "deco-sites/storefront/sections/Cards/ImageCardsCarousel.tsx": $$$$$$3,
     "deco-sites/storefront/sections/Cards/ImageCardsCarouselWithImage.tsx":
-      $$$$$$15,
-    "deco-sites/storefront/sections/Category/CategoryBanner.tsx": $$$$$$2,
-    "deco-sites/storefront/sections/Category/CategoryGrid.tsx": $$$$$$4,
-    "deco-sites/storefront/sections/Category/CategoryList.tsx": $$$$$$3,
-    "deco-sites/storefront/sections/Content/Benefits.tsx": $$$$$$30,
-    "deco-sites/storefront/sections/Content/BlogPosts.tsx": $$$$$$21,
-    "deco-sites/storefront/sections/Content/CallToAction.tsx": $$$$$$27,
-    "deco-sites/storefront/sections/Content/Faq.tsx": $$$$$$29,
-    "deco-sites/storefront/sections/Content/Features.tsx": $$$$$$19,
-    "deco-sites/storefront/sections/Content/Hero.tsx": $$$$$$18,
-    "deco-sites/storefront/sections/Content/ImageSection.tsx": $$$$$$31,
-    "deco-sites/storefront/sections/Content/Intro.tsx": $$$$$$20,
-    "deco-sites/storefront/sections/Content/Logos.tsx": $$$$$$26,
-    "deco-sites/storefront/sections/Content/Partners.tsx": $$$$$$24,
-    "deco-sites/storefront/sections/Content/RichText.tsx": $$$$$$23,
-    "deco-sites/storefront/sections/Content/Table.tsx": $$$$$$28,
-    "deco-sites/storefront/sections/Content/Testimonials.tsx": $$$$$$25,
-    "deco-sites/storefront/sections/Content/TextWithImage.tsx": $$$$$$22,
-    "deco-sites/storefront/sections/Footer/Footer.tsx": $$$$$$1,
-    "deco-sites/storefront/sections/Gallery.tsx": $$$$$$0,
-    "deco-sites/storefront/sections/Header/Header.tsx": $$$$$$51,
-    "deco-sites/storefront/sections/Images/BannerGrid.tsx": $$$$$$6,
-    "deco-sites/storefront/sections/Images/Carousel.tsx": $$$$$$8,
-    "deco-sites/storefront/sections/Images/ImageGallery.tsx": $$$$$$7,
-    "deco-sites/storefront/sections/Images/ShoppableBanner.tsx": $$$$$$5,
-    "deco-sites/storefront/sections/Layout/Container.tsx": $$$$$$9,
-    "deco-sites/storefront/sections/Layout/Flex.tsx": $$$$$$11,
-    "deco-sites/storefront/sections/Layout/Grid.tsx": $$$$$$10,
-    "deco-sites/storefront/sections/Layout/GridItem.tsx": $$$$$$12,
-    "deco-sites/storefront/sections/Links/LinkTree.tsx": $$$$$$48,
-    "deco-sites/storefront/sections/Links/Shortcuts.tsx": $$$$$$49,
-    "deco-sites/storefront/sections/Miscellaneous/CampaignTimer.tsx": $$$$$$42,
-    "deco-sites/storefront/sections/Miscellaneous/CookieConsent.tsx": $$$$$$43,
-    "deco-sites/storefront/sections/Miscellaneous/Slide.tsx": $$$$$$44,
-    "deco-sites/storefront/sections/Newsletter/Newsletter.tsx": $$$$$$50,
+      $$$$$$4,
+    "deco-sites/storefront/sections/Category/CategoryBanner.tsx": $$$$$$5,
+    "deco-sites/storefront/sections/Category/CategoryGrid.tsx": $$$$$$6,
+    "deco-sites/storefront/sections/Category/CategoryList.tsx": $$$$$$7,
+    "deco-sites/storefront/sections/Content/Benefits.tsx": $$$$$$8,
+    "deco-sites/storefront/sections/Content/BlogPosts.tsx": $$$$$$9,
+    "deco-sites/storefront/sections/Content/CallToAction.tsx": $$$$$$10,
+    "deco-sites/storefront/sections/Content/Faq.tsx": $$$$$$11,
+    "deco-sites/storefront/sections/Content/Features.tsx": $$$$$$12,
+    "deco-sites/storefront/sections/Content/Hero.tsx": $$$$$$13,
+    "deco-sites/storefront/sections/Content/ImageSection.tsx": $$$$$$14,
+    "deco-sites/storefront/sections/Content/Intro.tsx": $$$$$$15,
+    "deco-sites/storefront/sections/Content/Logos.tsx": $$$$$$16,
+    "deco-sites/storefront/sections/Content/Partners.tsx": $$$$$$17,
+    "deco-sites/storefront/sections/Content/RichText.tsx": $$$$$$18,
+    "deco-sites/storefront/sections/Content/Table.tsx": $$$$$$19,
+    "deco-sites/storefront/sections/Content/Testimonials.tsx": $$$$$$20,
+    "deco-sites/storefront/sections/Content/TextWithImage.tsx": $$$$$$21,
+    "deco-sites/storefront/sections/Footer/Footer.tsx": $$$$$$22,
+    "deco-sites/storefront/sections/Gallery.tsx": $$$$$$23,
+    "deco-sites/storefront/sections/Header/Header.tsx": $$$$$$24,
+    "deco-sites/storefront/sections/Images/BannerGrid.tsx": $$$$$$25,
+    "deco-sites/storefront/sections/Images/Carousel.tsx": $$$$$$26,
+    "deco-sites/storefront/sections/Images/ImageGallery.tsx": $$$$$$27,
+    "deco-sites/storefront/sections/Images/ShoppableBanner.tsx": $$$$$$28,
+    "deco-sites/storefront/sections/Layout/Container.tsx": $$$$$$29,
+    "deco-sites/storefront/sections/Layout/Flex.tsx": $$$$$$30,
+    "deco-sites/storefront/sections/Layout/Grid.tsx": $$$$$$31,
+    "deco-sites/storefront/sections/Layout/GridItem.tsx": $$$$$$32,
+    "deco-sites/storefront/sections/Links/LinkTree.tsx": $$$$$$33,
+    "deco-sites/storefront/sections/Links/Shortcuts.tsx": $$$$$$34,
+    "deco-sites/storefront/sections/Miscellaneous/CampaignTimer.tsx": $$$$$$35,
+    "deco-sites/storefront/sections/Miscellaneous/CookieConsent.tsx": $$$$$$36,
+    "deco-sites/storefront/sections/Miscellaneous/Slide.tsx": $$$$$$37,
+    "deco-sites/storefront/sections/Newsletter/Newsletter.tsx": $$$$$$38,
     "deco-sites/storefront/sections/Product/ImageGalleryFrontBack.tsx":
-      $$$$$$38,
-    "deco-sites/storefront/sections/Product/ImageGallerySlider.tsx": $$$$$$37,
+      $$$$$$39,
+    "deco-sites/storefront/sections/Product/ImageGallerySlider.tsx": $$$$$$40,
     "deco-sites/storefront/sections/Product/NotFound.tsx": $$$$$$41,
-    "deco-sites/storefront/sections/Product/NotFoundChallenge.tsx": $$$$$$33,
-    "deco-sites/storefront/sections/Product/ProductInfo.tsx": $$$$$$35,
-    "deco-sites/storefront/sections/Product/ProductShelf.tsx": $$$$$$36,
-    "deco-sites/storefront/sections/Product/ProductShelfTabbed.tsx": $$$$$$40,
-    "deco-sites/storefront/sections/Product/SearchResult.tsx": $$$$$$34,
-    "deco-sites/storefront/sections/Product/ShelfWithImage.tsx": $$$$$$39,
-    "deco-sites/storefront/sections/Product/Wishlist.tsx": $$$$$$32,
-    "deco-sites/storefront/sections/Social/InstagramPosts.tsx": $$$$$$46,
-    "deco-sites/storefront/sections/Social/WhatsApp.tsx": $$$$$$45,
-    "deco-sites/storefront/sections/Theme/Theme.tsx": $$$$$$47,
+    "deco-sites/storefront/sections/Product/NotFoundChallenge.tsx": $$$$$$42,
+    "deco-sites/storefront/sections/Product/ProductInfo.tsx": $$$$$$43,
+    "deco-sites/storefront/sections/Product/ProductShelf.tsx": $$$$$$44,
+    "deco-sites/storefront/sections/Product/ProductShelfTabbed.tsx": $$$$$$45,
+    "deco-sites/storefront/sections/Product/SearchResult.tsx": $$$$$$46,
+    "deco-sites/storefront/sections/Product/ShelfWithImage.tsx": $$$$$$47,
+    "deco-sites/storefront/sections/Product/Wishlist.tsx": $$$$$$48,
+    "deco-sites/storefront/sections/Social/InstagramPosts.tsx": $$$$$$49,
+    "deco-sites/storefront/sections/Social/WhatsApp.tsx": $$$$$$50,
+    "deco-sites/storefront/sections/Theme/Theme.tsx": $$$$$$51,
   },
   "apps": {
     "deco-sites/storefront/apps/decohub.ts": $$$$$$$$$$$0,
diff --git a/sections/Miscellaneous/CampaignTimer.tsx b/sections/Miscellaneous/CampaignTimer.tsx
index 633d3f6c..f0d26de8 100644
--- a/sections/Miscellaneous/CampaignTimer.tsx
+++ b/sections/Miscellaneous/CampaignTimer.tsx
@@ -1,5 +1,6 @@
 import { useId } from "$store/sdk/useId.ts";
 import type { HTMLWidget } from "apps/admin/widgets.ts";
+import { scriptAsDataURI } from "apps/utils/dataURI.ts";
 
 export interface Props {
   /**
@@ -130,12 +131,7 @@ function CampaignTimer({
           </div>
         </div>
       </div>
-      <script
-        type="module"
-        dangerouslySetInnerHTML={{
-          __html: `(${snippet})("${expiresAt}", "${id}");`,
-        }}
-      />
+      <script defer src={scriptAsDataURI(snippet, expiresAt, id)} />
     </>
   );
 }