diff --git a/custom-elements.json b/custom-elements.json
index 14e6bba87..4fd3f17c4 100644
--- a/custom-elements.json
+++ b/custom-elements.json
@@ -18682,39 +18682,15 @@
     {
       "name": "foxy-payment-card",
       "path": "./src/elements/public/PaymentCard/index.ts",
-      "description": "Basic card displaying a payment.\n\nNote: payment gateway names need to be loaded separately. You can obtain\nthem from `fx:property_helpers` using your own Backend API proxy or just hardcode the values\nyou need. Once you have the gateway names, call `I18n.setGateways(names)`.",
+      "description": "Basic card displaying a payment resource (`fx:payment`).",
       "attributes": [
         {
-          "name": "mode",
-          "type": "string",
-          "default": "\"production\""
-        },
-        {
-          "name": "readonly",
-          "type": "boolean",
-          "default": "false"
+          "name": "hosted-payment-gateways-helper",
+          "description": "URL of the `fx:hosted_payment_gateways` property helper resource."
         },
         {
-          "name": "readonlycontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "disabled",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "disabledcontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "hidden",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "hiddencontrols",
-          "default": "\"False\""
+          "name": "payment-gateways-helper",
+          "description": "URL of the `fx:payment_gateways` property helper resource."
         },
         {
           "name": "ns",
@@ -18757,60 +18733,14 @@
       ],
       "properties": [
         {
-          "name": "templates",
-          "type": "Templates",
-          "default": "{}"
-        },
-        {
-          "name": "mode",
-          "attribute": "mode",
-          "type": "string",
-          "default": "\"production\""
+          "name": "hostedPaymentGatewaysHelper",
+          "attribute": "hosted-payment-gateways-helper",
+          "description": "URL of the `fx:hosted_payment_gateways` property helper resource."
         },
         {
-          "name": "readonly",
-          "attribute": "readonly",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "readonlyControls",
-          "attribute": "readonlycontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "disabled",
-          "attribute": "disabled",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "disabledControls",
-          "attribute": "disabledcontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "hidden",
-          "attribute": "hidden",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "hiddenControls",
-          "attribute": "hiddencontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "readonlySelector",
-          "type": "BooleanSelector"
-        },
-        {
-          "name": "disabledSelector",
-          "type": "BooleanSelector"
-        },
-        {
-          "name": "hiddenSelector",
-          "type": "BooleanSelector"
+          "name": "paymentGatewaysHelper",
+          "attribute": "payment-gateways-helper",
+          "description": "URL of the `fx:payment_gateways` property helper resource."
         },
         {
           "name": "ns",
@@ -18823,6 +18753,10 @@
           "type": "Translator",
           "default": "\"(key, options) => {\\n      const I18nElement = customElements.get('foxy-i18n') as typeof I18n | undefined;\\n\\n      if (!I18nElement) return key;\\n\\n      const keys = [\\n        ...this.ns\\n          .split(' ')\\n          .reverse()\\n          .map(v => v.trim())\\n          .filter(v => v.length > 0)\\n          .reverse()\\n          .map((v, i, a) => `${v}:${[...a.slice(i + 1), key].join('.')}`),\\n        `shared:${key}`,\\n      ];\\n\\n      return I18nElement.i18next.t(keys, { lng: this.lang, ...options }).toString();\\n    }\""
         },
+        {
+          "name": "isBodyReady",
+          "type": "boolean"
+        },
         {
           "name": "UpdateEvent",
           "description": "Instances of this event are dispatched on an element whenever it changes its\nstate (e.g. when going from `busy` to `idle` or on `form` data change).\nThis event isn't cancelable, and it does not bubble.",
@@ -18910,38 +18844,6 @@
           "name": "fetch",
           "description": "Instance of `NucleonElement.API.FetchEvent`. Emitted before each API request."
         }
-      ],
-      "slots": [
-        {
-          "name": "title:before"
-        },
-        {
-          "name": "title:after"
-        },
-        {
-          "name": "subtitle:before"
-        },
-        {
-          "name": "subtitle:after"
-        },
-        {
-          "name": "card-info:before"
-        },
-        {
-          "name": "card-info:after"
-        },
-        {
-          "name": "fraud-risk:before"
-        },
-        {
-          "name": "fraud-risk:after"
-        },
-        {
-          "name": "processor-response:before"
-        },
-        {
-          "name": "processor-response:after"
-        }
       ]
     },
     {
@@ -21716,40 +21618,8 @@
     {
       "name": "foxy-shipment-card",
       "path": "./src/elements/public/ShipmentCard/index.ts",
-      "description": "Basic card displaying a shipment.",
+      "description": "Basic card displaying a shipment (`fx:shipment`).",
       "attributes": [
-        {
-          "name": "mode",
-          "type": "string",
-          "default": "\"production\""
-        },
-        {
-          "name": "readonly",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "readonlycontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "disabled",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "disabledcontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "hidden",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "hiddencontrols",
-          "default": "\"False\""
-        },
         {
           "name": "ns",
           "type": "string",
@@ -21790,61 +21660,6 @@
         }
       ],
       "properties": [
-        {
-          "name": "templates",
-          "default": "{}"
-        },
-        {
-          "name": "mode",
-          "attribute": "mode",
-          "type": "string",
-          "default": "\"production\""
-        },
-        {
-          "name": "readonly",
-          "attribute": "readonly",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "readonlyControls",
-          "attribute": "readonlycontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "disabled",
-          "attribute": "disabled",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "disabledControls",
-          "attribute": "disabledcontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "hidden",
-          "attribute": "hidden",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "hiddenControls",
-          "attribute": "hiddencontrols",
-          "default": "\"False\""
-        },
-        {
-          "name": "readonlySelector",
-          "type": "BooleanSelector"
-        },
-        {
-          "name": "disabledSelector",
-          "type": "BooleanSelector"
-        },
-        {
-          "name": "hiddenSelector",
-          "type": "BooleanSelector"
-        },
         {
           "name": "ns",
           "attribute": "ns",
@@ -26034,6 +25849,12 @@
         {
           "name": "google-analytics:after"
         },
+        {
+          "name": "google-tag:before"
+        },
+        {
+          "name": "google-tag:after"
+        },
         {
           "name": "troubleshooting:before"
         },
@@ -26930,6 +26751,14 @@
       "path": "./src/elements/public/Transaction/index.ts",
       "description": "Transaction summary page (`fx:transaction`).",
       "attributes": [
+        {
+          "name": "hosted-payment-gateways-helper",
+          "description": "URL of the `fx:hosted_payment_gateways` property helper resource."
+        },
+        {
+          "name": "payment-gateways-helper",
+          "description": "URL of the `fx:payment_gateways` property helper resource."
+        },
         {
           "name": "ns",
           "type": "string",
@@ -27007,6 +26836,16 @@
         }
       ],
       "properties": [
+        {
+          "name": "hostedPaymentGatewaysHelper",
+          "attribute": "hosted-payment-gateways-helper",
+          "description": "URL of the `fx:hosted_payment_gateways` property helper resource."
+        },
+        {
+          "name": "paymentGatewaysHelper",
+          "attribute": "payment-gateways-helper",
+          "description": "URL of the `fx:payment_gateways` property helper resource."
+        },
         {
           "name": "getSubscriptionPageHref"
         },
@@ -27324,6 +27163,10 @@
           "type": "Translator",
           "default": "\"(key, options) => {\\n      const I18nElement = customElements.get('foxy-i18n') as typeof I18n | undefined;\\n\\n      if (!I18nElement) return key;\\n\\n      const keys = [\\n        ...this.ns\\n          .split(' ')\\n          .reverse()\\n          .map(v => v.trim())\\n          .filter(v => v.length > 0)\\n          .reverse()\\n          .map((v, i, a) => `${v}:${[...a.slice(i + 1), key].join('.')}`),\\n        `shared:${key}`,\\n      ];\\n\\n      return I18nElement.i18next.t(keys, { lng: this.lang, ...options }).toString();\\n    }\""
         },
+        {
+          "name": "isBodyReady",
+          "type": "boolean"
+        },
         {
           "name": "UpdateEvent",
           "description": "Instances of this event are dispatched on an element whenever it changes its\nstate (e.g. when going from `busy` to `idle` or on `form` data change).\nThis event isn't cancelable, and it does not bubble.",
diff --git a/src/elements/public/AdminSubscriptionCard/AdminSubscriptionCard.test.ts b/src/elements/public/AdminSubscriptionCard/AdminSubscriptionCard.test.ts
index 155c1da9f..abe22236c 100644
--- a/src/elements/public/AdminSubscriptionCard/AdminSubscriptionCard.test.ts
+++ b/src/elements/public/AdminSubscriptionCard/AdminSubscriptionCard.test.ts
@@ -692,4 +692,50 @@ describe('AdminSubscriptionCard', () => {
 
     expect(element.renderRoot).to.include.text('test@test-remote.com');
   });
+
+  it('renders customer name in line 3 from embedded fx:customer', async () => {
+    type Subscription = Resource<Rels.Subscription, { zoom: ['customer'] }>;
+
+    const router = createRouter();
+    const href = 'https://demo.api/hapi/subscriptions/0?zoom=customer';
+    const data = await getTestData<Subscription>(href, router);
+
+    const element = await fixture<Card>(html`
+      <foxy-admin-subscription-card
+        locale-codes="https://demo.api/hapi/property_helpers/7"
+        @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
+      >
+      </foxy-admin-subscription-card>
+    `);
+
+    data._embedded['fx:customer'].first_name = 'Test';
+    data._embedded['fx:customer'].last_name = 'User';
+    element.data = data;
+
+    await waitUntil(() => element.isBodyReady, '', { timeout: 5000 });
+    expect(element.renderRoot).to.include.text('Test User');
+  });
+
+  it('renders customer name in line 3 from remote fx:customer', async () => {
+    const router = createRouter();
+    const href = 'https://demo.api/hapi/subscriptions/0';
+    const data = await getTestData<Resource<Rels.Subscription>>(href, router);
+
+    const element = await fixture<Card>(html`
+      <foxy-admin-subscription-card
+        locale-codes="https://demo.api/hapi/property_helpers/7"
+        href=${href}
+        @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
+      >
+      </foxy-admin-subscription-card>
+    `);
+
+    await new Card.API(element).fetch(data._links['fx:customer'].href, {
+      method: 'PATCH',
+      body: JSON.stringify({ first_name: 'Test', last_name: 'User' }),
+    });
+
+    await waitUntil(() => element.isBodyReady, '', { timeout: 5000 });
+    expect(element.renderRoot).to.include.text('Test User');
+  });
 });
diff --git a/src/elements/public/AdminSubscriptionCard/AdminSubscriptionCard.ts b/src/elements/public/AdminSubscriptionCard/AdminSubscriptionCard.ts
index 313bf24e7..2e932ab3a 100644
--- a/src/elements/public/AdminSubscriptionCard/AdminSubscriptionCard.ts
+++ b/src/elements/public/AdminSubscriptionCard/AdminSubscriptionCard.ts
@@ -45,12 +45,15 @@ export class AdminSubscriptionCard extends Base<Data> {
 
   private readonly __templateSetLoaderId = 'templateSetLoader';
 
+  private readonly __customerLoaderId = 'customerLoader';
+
   private readonly __itemsLoaderId = 'itemsLoader';
 
   private readonly __storeLoaderId = 'storeLoader';
 
   renderBody(): TemplateResult {
     const isFailed = !!this.data?.first_failed_transaction_date;
+    const customer = this.__customer;
     const cart = this.__transactionTemplate;
 
     const priceKey = this.__priceKey;
@@ -97,6 +100,15 @@ export class AdminSubscriptionCard extends Base<Data> {
       >
       </foxy-nucleon>
 
+      <foxy-nucleon
+        class="hidden"
+        infer=""
+        href=${ifDefined(this.__customerHref)}
+        id=${this.__customerLoaderId}
+        @update=${() => this.requestUpdate()}
+      >
+      </foxy-nucleon>
+
       <foxy-nucleon
         class="hidden"
         infer=""
@@ -135,14 +147,21 @@ export class AdminSubscriptionCard extends Base<Data> {
             : html`&ZeroWidthSpace;`}
         </div>
 
-        <div class="text-tertiary truncate text-s">${cart?.customer_email}&ZeroWidthSpace;</div>
+        <div class="text-tertiary truncate text-s">
+          ${customer?.first_name} ${customer?.last_name} (${cart?.customer_email})
+        </div>
       </div>
     `;
   }
 
   get isBodyReady(): boolean {
-    const isLoaded = !!this.__items && !!this.__currencyCode && !!this.__currencyDisplay;
-    return super.isBodyReady && isLoaded;
+    return (
+      super.isBodyReady &&
+      !!this.__items &&
+      !!this.__currencyCode &&
+      !!this.__currencyDisplay &&
+      !!this.__customer
+    );
   }
 
   private get __transactionTemplateHref() {
@@ -181,6 +200,11 @@ export class AdminSubscriptionCard extends Base<Data> {
     if (!cart?.currency_code) return cart?.template_set_uri || void 0;
   }
 
+  private get __customerHref() {
+    if ('fx:customer' in (this.data?._embedded ?? {})) return;
+    return this.data?._links['fx:customer']?.href;
+  }
+
   private get __itemsHref() {
     const cart = this.__transactionTemplate;
 
@@ -229,6 +253,18 @@ export class AdminSubscriptionCard extends Base<Data> {
     return this.renderRoot.querySelector<Loader>(selector)?.data ?? null;
   }
 
+  private get __customer() {
+    const data = this.data;
+
+    if (data && '_embedded' in data && 'fx:customer' in data._embedded) {
+      return data._embedded['fx:customer'] as Resource<Rels.Customer>;
+    } else {
+      type Loader = NucleonElement<Resource<Rels.Customer>>;
+      const selector = `#${this.__customerLoaderId}`;
+      return this.renderRoot.querySelector<Loader>(selector)?.data ?? null;
+    }
+  }
+
   private get __items() {
     type Cart = Resource<Rels.TransactionTemplate>;
     type CartWithItems = Resource<Rels.TransactionTemplate, { zoom: 'items' }>;
diff --git a/src/elements/public/AdminSubscriptionCard/types.ts b/src/elements/public/AdminSubscriptionCard/types.ts
index cb02950d6..10cf80401 100644
--- a/src/elements/public/AdminSubscriptionCard/types.ts
+++ b/src/elements/public/AdminSubscriptionCard/types.ts
@@ -3,5 +3,6 @@ import type { Rels } from '@foxy.io/sdk/backend';
 
 export type Data =
   | Resource<Rels.Subscription>
-  | Resource<Rels.Subscription, { zoom: 'transaction_template' }>
-  | Resource<Rels.Subscription, { zoom: { transaction_template: 'items' } }>;
+  | Resource<Rels.Subscription, { zoom: ['customer'] }>
+  | Resource<Rels.Subscription, { zoom: ['transaction_template', 'customer'] }>
+  | Resource<Rels.Subscription, { zoom: [{ transaction_template: 'items' }, 'customer'] }>;
diff --git a/src/elements/public/CartCard/CartCard.test.ts b/src/elements/public/CartCard/CartCard.test.ts
index 0dcfa8eb2..6a91259cd 100644
--- a/src/elements/public/CartCard/CartCard.test.ts
+++ b/src/elements/public/CartCard/CartCard.test.ts
@@ -46,64 +46,6 @@ describe('CartCard', () => {
     expect(new CartCard()).to.be.instanceOf(InternalCard);
   });
 
-  it('renders exact item count in line 1 when items are embedded', async () => {
-    type Items = Resource<Rels.Items>;
-    type Cart = Resource<Rels.Cart, { zoom: 'items' }>;
-
-    const router = createRouter();
-    const href = 'https://demo.api/hapi/carts/0?zoom=items';
-    const data = await getTestData<Cart>(href);
-    const items = await getTestData<Items>(data._links['fx:items'].href);
-
-    const element = await fixture<CartCard>(html`
-      <foxy-cart-card
-        locale-codes="https://demo.api/hapi/property_helpers/7"
-        @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
-      >
-      </foxy-cart-card>
-    `);
-
-    data._embedded['fx:items'] = [items._embedded['fx:items'][0]];
-    element.data = data;
-
-    await waitUntil(() => element.isBodyReady, '', { timeout: 5000 });
-
-    const line1 = await getByKey(element, 'line_1');
-
-    expect(line1).to.exist;
-    expect(line1).to.have.attribute('infer', '');
-    expect(line1).to.have.nested.property('options.count', 1);
-  });
-
-  it('renders approximate item count in line 1 when exactly 20 items are embedded', async () => {
-    type Items = Resource<Rels.Items>;
-    type Cart = Resource<Rels.Cart, { zoom: 'items' }>;
-
-    const router = createRouter();
-    const href = 'https://demo.api/hapi/carts/0?zoom=items';
-    const data = await getTestData<Cart>(href);
-    const items = await getTestData<Items>(data._links['fx:items'].href);
-
-    const element = await fixture<CartCard>(html`
-      <foxy-cart-card
-        locale-codes="https://demo.api/hapi/property_helpers/7"
-        @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
-      >
-      </foxy-cart-card>
-    `);
-
-    data._embedded['fx:items'] = new Array(20).fill(items._embedded['fx:items'][0]);
-    element.data = data;
-
-    await waitUntil(() => element.isBodyReady, '', { timeout: 5000 });
-
-    const line1 = await getByKey(element, 'line_1_approximate');
-
-    expect(line1).to.exist;
-    expect(line1).to.have.attribute('infer', '');
-    expect(line1).to.have.nested.property('options.count', 20);
-  });
-
   it('uses store-wide currency display settings for line 1 (intl symbol: true)', async () => {
     const router = createRouter();
     const href = 'https://demo.api/hapi/carts/0';
@@ -162,7 +104,7 @@ describe('CartCard', () => {
     expect(line1).to.have.nested.property('options.currencyDisplay', 'symbol');
   });
 
-  it('renders cart total in line 1', async () => {
+  it('renders cart ID and total in line 1', async () => {
     const router = createRouter();
     const href = 'https://demo.api/hapi/carts/0';
     const data = await getTestData<Data & { currency_code?: string }>(href);
@@ -183,6 +125,7 @@ describe('CartCard', () => {
     expect(line1).to.exist;
     expect(line1).to.have.attribute('infer', '');
     expect(line1).to.have.nested.property('options.amount');
+    expect(line1).to.have.nested.property('options.id', 0);
 
     expect(line1.options.amount.split(' ')[0]).to.equal(String(data.total_order));
   });
diff --git a/src/elements/public/CartCard/CartCard.ts b/src/elements/public/CartCard/CartCard.ts
index bad63cbc2..22cc12399 100644
--- a/src/elements/public/CartCard/CartCard.ts
+++ b/src/elements/public/CartCard/CartCard.ts
@@ -1,7 +1,7 @@
 import type { PropertyDeclarations } from 'lit-element';
 import type { TemplateResult } from 'lit-html';
 import type { NucleonElement } from '../NucleonElement/NucleonElement';
-import type { Resource } from '@foxy.io/sdk/core';
+import { getResourceId, Resource } from '@foxy.io/sdk/core';
 import type { Rels } from '@foxy.io/sdk/backend';
 import type { Data } from './types';
 
@@ -48,7 +48,6 @@ export class CartCard extends Base<Data> {
   renderBody(): TemplateResult {
     const statusOptions = this.__statusOptions;
     const line1Options = this.__line1Options;
-    const line1Key = this.__line1Key;
     const line2Options = this.__line2Options;
     const line2Key = this.__line2Key;
     const data = this.data;
@@ -102,8 +101,8 @@ export class CartCard extends Base<Data> {
       <div class="text-left leading-s">
         <div class="flex items-center space-x-s">
           <span class="flex-1 font-medium text-body truncate">
-            ${line1Options && line1Key
-              ? html`<foxy-i18n infer="" key=${line1Key} .options=${line1Options}></foxy-i18n>`
+            ${line1Options
+              ? html`<foxy-i18n infer="" key="line_1" .options=${line1Options}></foxy-i18n>`
               : html`&ZeroWidthSpace;`}
           </span>
           <span class="text-s text-tertiary">
@@ -261,12 +260,15 @@ export class CartCard extends Base<Data> {
     const count = this.__items?.count;
     if (count === undefined) return;
 
-    return { amount: `${totalOrder} ${currencyCode}`, currencyDisplay, count };
-  }
+    const href = this.data?._links['self'].href;
+    if (href === undefined) return;
 
-  private get __line1Key() {
-    const items = this.__items;
-    if (items) return items.isApproximateCount ? 'line_1_approximate' : 'line_1';
+    return {
+      currencyDisplay,
+      amount: `${totalOrder} ${currencyCode}`,
+      count,
+      id: getResourceId(href),
+    };
   }
 
   private get __line2Options() {
diff --git a/src/elements/public/CustomerPortal/InternalCustomerPortalLoggedOutView.test.ts b/src/elements/public/CustomerPortal/InternalCustomerPortalLoggedOutView.test.ts
index 90845ba75..c7aec59ee 100644
--- a/src/elements/public/CustomerPortal/InternalCustomerPortalLoggedOutView.test.ts
+++ b/src/elements/public/CustomerPortal/InternalCustomerPortalLoggedOutView.test.ts
@@ -731,8 +731,6 @@ describe('InternalCustomerPortalLoggedOutView', () => {
         expect(form).to.have.attribute('group', 'test');
         expect(form).to.have.attribute('lang', 'es');
         expect(form).to.have.attribute('ns', 'qwerty sign-up-form');
-        expect(form).to.have.deep.property('tosCheckboxSettings', undefined);
-        expect(form).to.have.deep.property('verification', null);
         expect(form).to.have.deep.property('templates', {});
         expect(form).to.have.deep.property('settings', null);
 
@@ -748,16 +746,6 @@ describe('InternalCustomerPortalLoggedOutView', () => {
 
         expect(form).to.have.deep.property('settings', element.data);
 
-        expect(form).to.have.deep.property(
-          'tosCheckboxSettings',
-          element.data?.tos_checkbox_settings
-        );
-
-        expect(form).to.have.deep.property('verification', {
-          type: 'hcaptcha',
-          siteKey: element.data?.sign_up?.verification.site_key,
-        });
-
         element.templates = {
           'sign-up:form:email:before': html => html`foo`,
           'foo:bar': html => html`bar`,
diff --git a/src/elements/public/CustomerPortal/InternalCustomerPortalLoggedOutView.ts b/src/elements/public/CustomerPortal/InternalCustomerPortalLoggedOutView.ts
index 04d7cf7c8..f860937c7 100644
--- a/src/elements/public/CustomerPortal/InternalCustomerPortalLoggedOutView.ts
+++ b/src/elements/public/CustomerPortal/InternalCustomerPortalLoggedOutView.ts
@@ -339,7 +339,6 @@ export class InternalCustomerPortalLoggedOutView extends Base<Data> {
   };
 
   private readonly __renderSignUpForm = () => {
-    const siteKey = this.data?.sign_up?.verification.site_key;
     const scope = 'sign-up:form';
     const hidden = [
       'tax-id',
@@ -365,8 +364,6 @@ export class InternalCustomerPortalLoggedOutView extends Base<Data> {
           lang=${this.lang}
           id="sign-up-form"
           ns="${this.ns} sign-up-form"
-          .tosCheckboxSettings=${this.data?.tos_checkbox_settings}
-          .verification=${siteKey ? { type: 'hcaptcha', siteKey } : null}
           .templates=${this.getNestedTemplates('sign-up:form')}
           .settings=${this.data}
           @update=${() => this.requestUpdate()}
diff --git a/src/elements/public/PaymentsApi/PaymentsApi.stories.mdx b/src/elements/public/PaymentsApi/PaymentsApi.stories.mdx
index 85a3e51e1..d9df8ed5f 100644
--- a/src/elements/public/PaymentsApi/PaymentsApi.stories.mdx
+++ b/src/elements/public/PaymentsApi/PaymentsApi.stories.mdx
@@ -298,7 +298,7 @@ Property helper listing all fraud protections that can be configured for a Payme
                 "id": "failure_handling",
                 "name": "Failure handling",
                 "type": "select",
-                "description": "Determines what happens to the checkout if your webhook fails.",
+                "description": "Determines what happens to the checkout submission if your webhook fails to respond correctly.",
                 "default_value": "",
                 "options": [
                   { "name": "Reject", "value": "reject" },
diff --git a/src/elements/public/PaymentsApi/PaymentsApi.test.ts b/src/elements/public/PaymentsApi/PaymentsApi.test.ts
index 422820f01..f3944f37c 100644
--- a/src/elements/public/PaymentsApi/PaymentsApi.test.ts
+++ b/src/elements/public/PaymentsApi/PaymentsApi.test.ts
@@ -633,7 +633,8 @@ describe('PaymentsApi', () => {
                     id: 'failure_handling',
                     name: 'Failure handling',
                     type: 'select',
-                    description: 'Determines what happens to the checkout if your webhook fails.',
+                    description:
+                      'Determines what happens to the checkout submission if your webhook fails to respond correctly.',
                     default_value: '',
                     options: [
                       { name: 'Reject', value: 'reject' },
diff --git a/src/elements/public/PaymentsApi/api/composers/available_fraud_protections.ts b/src/elements/public/PaymentsApi/api/composers/available_fraud_protections.ts
index cffbe66fa..1748a2fc5 100644
--- a/src/elements/public/PaymentsApi/api/composers/available_fraud_protections.ts
+++ b/src/elements/public/PaymentsApi/api/composers/available_fraud_protections.ts
@@ -85,7 +85,8 @@ export function compose(params: Params): AvailableFraudProtections {
                   id: 'failure_handling',
                   name: 'Failure handling',
                   type: 'select',
-                  description: 'Determines what happens to the checkout if your webhook fails.',
+                  description:
+                    'Determines what happens to the checkout submission if your webhook fails to respond correctly.',
                   default_value: '',
                   options: [
                     { name: 'Reject', value: 'reject' },
diff --git a/src/elements/public/SubscriptionCard/SubscriptionCard.test.ts b/src/elements/public/SubscriptionCard/SubscriptionCard.test.ts
index af536e3ac..0ca78bdd0 100644
--- a/src/elements/public/SubscriptionCard/SubscriptionCard.test.ts
+++ b/src/elements/public/SubscriptionCard/SubscriptionCard.test.ts
@@ -10,6 +10,7 @@ import { getByTag } from '../../../testgen/getByTag';
 import { getByTestId } from '../../../testgen/getByTestId';
 import { getTestData } from '../../../testgen/getTestData';
 import { unsafeHTML } from 'lit-html/directives/unsafe-html';
+import { getByKey } from '../../../testgen/getByKey';
 
 describe('SubscriptionCard', () => {
   const OriginalResizeObserver = window.ResizeObserver;
@@ -194,6 +195,21 @@ describe('SubscriptionCard', () => {
     expect(control).to.have.attribute('ns', 'subscription-card');
   });
 
+  it('once loaded, renders a hint about fees and taxes included in the price', async () => {
+    const href = './hapi/subscriptions/0?zoom=transaction_template:items';
+    const data = await getTestData<Data>(href);
+    const layout = html`<foxy-subscription-card lang="es" .data=${data}></foxy-subscription-card>`;
+    const element = await fixture<SubscriptionCard>(layout);
+    const hint = await getByKey(element, 'fees_hint');
+    const explainer = await getByKey(element, 'fees_explainer');
+
+    expect(hint).to.exist;
+    expect(hint).to.have.attribute('infer', '');
+
+    expect(explainer).to.exist;
+    expect(explainer).to.have.attribute('infer', '');
+  });
+
   it('renders empty foxy-spinner by default', async () => {
     const layout = html`<foxy-subscription-card lang="es"></foxy-subscription-card>`;
     const element = await fixture<SubscriptionCard>(layout);
diff --git a/src/elements/public/SubscriptionCard/SubscriptionCard.ts b/src/elements/public/SubscriptionCard/SubscriptionCard.ts
index 4d99060a4..699e93007 100644
--- a/src/elements/public/SubscriptionCard/SubscriptionCard.ts
+++ b/src/elements/public/SubscriptionCard/SubscriptionCard.ts
@@ -83,16 +83,24 @@ export class SubscriptionCard extends Base<Data> {
             </div>
 
             <div
-              class="flex-1 font-medium leading-xs mb-xs sm-mb-0 sm-text-right text-xxs sm-text-l tracking-wide sm-tracking-normal uppercase sm-normal-case order-0 sm-order-1 font-tnum text-secondary sm-text-body"
+              class="flex-1 leading-xs mb-xs sm-mb-0 sm-text-right order-0 sm-order-1"
             >
               <foxy-i18n
                 data-testid="price"
                 options=${JSON.stringify(this.__getPriceOptions())}
+                class="text-xxs sm-text-l font-tnum tracking-wide sm-tracking-normal uppercase sm-normal-case font-medium text-secondary sm-text-body sm-block"
                 lang=${this.lang}
                 key="price_${this.data?.frequency === '.5m' ? 'twice_a_month' : 'recurring'}"
                 ns=${this.ns}
               >
               </foxy-i18n>
+              <span class="text-secondary font-medium sm-font-normal sm-block text-xxs sm-text-s">
+                <span class="sm-hidden">(</span><span class="hidden sm-inline">*</span><foxy-i18n infer="" key="fees_hint"></foxy-i18n><span class="sm-hidden">)</span>
+                <iron-icon id="hint" icon="icons:info-outline" class="icon-inline"></iron-icon>
+                <vcf-tooltip for="hint" position="bottom">
+                  <span class="text-s"><foxy-i18n infer="" key="fees_explainer"></foxy-i18n></span>
+                </vcf-tooltip>
+              <span>
               &#8203;
             </div>
           </div>
diff --git a/src/elements/public/SubscriptionCard/index.ts b/src/elements/public/SubscriptionCard/index.ts
index 14d34ea66..96040a73a 100644
--- a/src/elements/public/SubscriptionCard/index.ts
+++ b/src/elements/public/SubscriptionCard/index.ts
@@ -1,3 +1,4 @@
+import '@vaadin-component-factory/vcf-tooltip';
 import '@polymer/iron-icons';
 import '@polymer/iron-icon';
 import '../../internal/InternalSandbox/index';
diff --git a/src/elements/public/TemplateConfigForm/TemplateConfigForm.test.ts b/src/elements/public/TemplateConfigForm/TemplateConfigForm.test.ts
index b8d64f86e..b704c1e87 100644
--- a/src/elements/public/TemplateConfigForm/TemplateConfigForm.test.ts
+++ b/src/elements/public/TemplateConfigForm/TemplateConfigForm.test.ts
@@ -3012,15 +3012,37 @@ describe('TemplateConfigForm', () => {
   });
 
   describe('google-analytics', () => {
-    it('is visible by default', async () => {
+    it('is hidden by default', async () => {
+      const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
+      const element = await fixture<TemplateConfigForm>(layout);
+      expect(await getByTestId(element, 'google-analytics')).to.not.exist;
+    });
+
+    it('is visible when Google Analytics is enabled', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       expect(await getByTestId(element, 'google-analytics')).to.exist;
     });
 
     it('is hidden when form is hidden', async () => {
       const layout = html`<foxy-template-config-form hidden></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       expect(await getByTestId(element, 'google-analytics')).to.not.exist;
     });
 
@@ -3029,14 +3051,29 @@ describe('TemplateConfigForm', () => {
         <foxy-template-config-form hiddencontrols="google-analytics"></foxy-template-config-form>
       `);
 
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       expect(await getByTestId(element, 'google-analytics')).to.not.exist;
     });
 
-    it('renders "google-analytics:before" slot by default', async () => {
+    it('renders "google-analytics:before" slot when visible', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
-      const slot = await getByName(element, 'google-analytics:before');
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
 
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
+      const slot = await getByName(element, 'google-analytics:before');
       expect(slot).to.be.instanceOf(HTMLSlotElement);
     });
 
@@ -3049,6 +3086,14 @@ describe('TemplateConfigForm', () => {
         </foxy-template-config-form>
       `);
 
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const slot = await getByName<HTMLSlotElement>(element, type);
       const sandbox = (await getByTestId<InternalSandbox>(element, type))!.renderRoot;
 
@@ -3056,11 +3101,18 @@ describe('TemplateConfigForm', () => {
       expect(sandbox).to.contain.html(value);
     });
 
-    it('renders "google-analytics:after" slot by default', async () => {
+    it('renders "google-analytics:after" slot when visible', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
-      const slot = await getByName(element, 'google-analytics:after');
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
 
+      const slot = await getByName(element, 'google-analytics:after');
       expect(slot).to.be.instanceOf(HTMLSlotElement);
     });
 
@@ -3073,6 +3125,14 @@ describe('TemplateConfigForm', () => {
         </foxy-template-config-form>
       `);
 
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const slot = await getByName<HTMLSlotElement>(element, type);
       const sandbox = (await getByTestId<InternalSandbox>(element, type))!.renderRoot;
 
@@ -3083,6 +3143,14 @@ describe('TemplateConfigForm', () => {
     it('renders a field labelled with i18n key ga_account_id', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = await getByTestId(control, 'google-analytics-field');
 
@@ -3092,6 +3160,14 @@ describe('TemplateConfigForm', () => {
     it('renders a field explained with i18n key ga_account_id_explainer', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = await getByTestId(control, 'google-analytics-field');
 
@@ -3104,7 +3180,11 @@ describe('TemplateConfigForm', () => {
       const data = await getTestData<Data>('./hapi/template_configs/0');
       const json = JSON.parse(data.json) as TemplateConfigJSON;
 
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
       element.data = data;
+      await element.requestUpdate();
+
       json.analytics_config.google_analytics.account_id = '123456';
       element.edit({ json: JSON.stringify(json) });
 
@@ -3120,7 +3200,11 @@ describe('TemplateConfigForm', () => {
       const data = await getTestData<Data>('./hapi/template_configs/0');
       const json = JSON.parse(data.json) as TemplateConfigJSON;
 
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
       element.data = data;
+      await element.requestUpdate();
+
       json.analytics_config.google_analytics.include_on_site = true;
       element.edit({ json: JSON.stringify(json) });
 
@@ -3133,6 +3217,14 @@ describe('TemplateConfigForm', () => {
     it('is enabled by default', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = await getByTestId(control, 'google-analytics-field');
       const check = await getByTestId(control, 'google-analytics-check');
@@ -3144,6 +3236,14 @@ describe('TemplateConfigForm', () => {
     it('is disabled when element is disabled', async () => {
       const layout = html`<foxy-template-config-form disabled></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = await getByTestId(control, 'google-analytics-field');
       const check = await getByTestId(control, 'google-analytics-check');
@@ -3157,6 +3257,14 @@ describe('TemplateConfigForm', () => {
         <foxy-template-config-form disabledcontrols="google-analytics"></foxy-template-config-form>
       `);
 
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = await getByTestId(control, 'google-analytics-field');
       const check = await getByTestId(control, 'google-analytics-check');
@@ -3168,6 +3276,14 @@ describe('TemplateConfigForm', () => {
     it('is editable by default', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = await getByTestId(control, 'google-analytics-field');
       const check = await getByTestId(control, 'google-analytics-check');
@@ -3179,6 +3295,14 @@ describe('TemplateConfigForm', () => {
     it('is readonly when element is readonly', async () => {
       const layout = html`<foxy-template-config-form readonly></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = await getByTestId(control, 'google-analytics-field');
       const check = await getByTestId(control, 'google-analytics-check');
@@ -3192,6 +3316,14 @@ describe('TemplateConfigForm', () => {
         <foxy-template-config-form readonlycontrols="google-analytics"></foxy-template-config-form>
       `);
 
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = await getByTestId(control, 'google-analytics-field');
       const check = await getByTestId(control, 'google-analytics-check');
@@ -3203,25 +3335,44 @@ describe('TemplateConfigForm', () => {
     it('writes to analytics_config.google_analytics.account_id property of parsed form.json value on change', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const field = (await getByTestId(control, 'google-analytics-field')) as TextFieldElement;
 
       field.value = '123456';
       field.dispatchEvent(new CustomEvent('input'));
 
-      const json = JSON.parse(element.form.json as string) as TemplateConfigJSON;
+      const newJSON = JSON.parse(element.form.json as string) as TemplateConfigJSON;
 
-      expect(json).to.have.nested.property(
+      expect(newJSON).to.have.nested.property(
         'analytics_config.google_analytics.account_id',
         '123456'
       );
 
-      expect(json).to.have.nested.property('analytics_config.google_analytics.usage', 'required');
+      expect(newJSON).to.have.nested.property(
+        'analytics_config.google_analytics.usage',
+        'required'
+      );
     });
 
     it('writes to analytics_config.google_analytics.include_on_site property of parsed form.json value on change', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const check = (await getByTestId(control, 'google-analytics-check')) as Checkbox;
 
@@ -3237,10 +3388,14 @@ describe('TemplateConfigForm', () => {
     it('switches analytics_config.google_analytics.usage property of parsed form.json to none when empty', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
-
       const data = await getTestData<Data>('./hapi/template_configs/0');
       let json = JSON.parse(data.json) as TemplateConfigJSON;
 
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       json.analytics_config.google_analytics.account_id = '123456';
       json.analytics_config.google_analytics.usage = 'required';
       element.edit({ json: JSON.stringify(json) });
@@ -3259,10 +3414,17 @@ describe('TemplateConfigForm', () => {
     it('renders translatable checkbox label and explainer', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
 
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
       element.lang = 'es';
       element.ns = 'foo';
 
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const check = (await getByTestId(control, 'google-analytics-check')) as Checkbox;
       const label = check.querySelector(`foxy-i18n[key="ga_include_on_site"]`);
@@ -3280,6 +3442,14 @@ describe('TemplateConfigForm', () => {
     it('renders translatable deprecation notice', async () => {
       const layout = html`<foxy-template-config-form></foxy-template-config-form>`;
       const element = await fixture<TemplateConfigForm>(layout);
+      const data = await getTestData<Data>('./hapi/template_configs/0');
+      const json = JSON.parse(data.json) as TemplateConfigJSON;
+
+      json.analytics_config.google_analytics.usage = 'required';
+      data.json = JSON.stringify(json);
+      element.data = data;
+      await element.requestUpdate();
+
       const control = (await getByTestId(element, 'google-analytics')) as HTMLElement;
       const notice = control.querySelector(`foxy-i18n[key="ga_deprecation_notice"]`);
 
diff --git a/src/elements/public/TemplateConfigForm/TemplateConfigForm.ts b/src/elements/public/TemplateConfigForm/TemplateConfigForm.ts
index 143a288e7..100b1b1f0 100644
--- a/src/elements/public/TemplateConfigForm/TemplateConfigForm.ts
+++ b/src/elements/public/TemplateConfigForm/TemplateConfigForm.ts
@@ -19,6 +19,7 @@ import { TranslatableMixin } from '../../../mixins/translatable';
 import { classMap } from '../../../utils/class-map';
 import { getDefaultJSON } from './defaults';
 import { live } from 'lit-html/directives/live';
+import { BooleanSelector } from '@foxy.io/sdk/core';
 
 const NS = 'template-config-form';
 const Base = ScopedElementsMixin(
@@ -55,6 +56,9 @@ const Base = ScopedElementsMixin(
  * @slot google-analytics:before
  * @slot google-analytics:after
  *
+ * @slot google-tag:before
+ * @slot google-tag:after
+ *
  * @slot troubleshooting:before
  * @slot troubleshooting:after
  *
@@ -211,6 +215,17 @@ export class TemplateConfigForm extends Base<Data> {
     `;
   }
 
+  get hiddenSelector(): BooleanSelector {
+    const alwaysHidden = [super.hiddenSelector.toString()];
+    const json: TemplateConfigJSON = this.data?.json ? JSON.parse(this.data.json) : null;
+
+    if (!json || json.analytics_config.google_analytics.usage === 'none') {
+      alwaysHidden.push('google-analytics');
+    }
+
+    return new BooleanSelector(alwaysHidden.join(' ').trim());
+  }
+
   private __renderCartType(json: TemplateConfigJSON) {
     const { lang, ns } = this;
     const items = ['default', 'fullpage', 'custom'];
diff --git a/src/elements/public/TemplateConfigForm/types.ts b/src/elements/public/TemplateConfigForm/types.ts
index ae0c3034d..2d7ac3f11 100644
--- a/src/elements/public/TemplateConfigForm/types.ts
+++ b/src/elements/public/TemplateConfigForm/types.ts
@@ -33,6 +33,9 @@ export type Templates = {
   'google-analytics:before'?: Renderer<TemplateConfigForm>;
   'google-analytics:after'?: Renderer<TemplateConfigForm>;
 
+  'google-tag:before'?: Renderer<TemplateConfigForm>;
+  'google-tag:after'?: Renderer<TemplateConfigForm>;
+
   'segment-io:before'?: Renderer<TemplateConfigForm>;
   'segment-io:after'?: Renderer<TemplateConfigForm>;
 
diff --git a/src/static/schemas/cart-card.json b/src/static/schemas/cart-card.json
index 9c137baa7..6648f5132 100644
--- a/src/static/schemas/cart-card.json
+++ b/src/static/schemas/cart-card.json
@@ -2,12 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "additionalProperties": false,
   "properties": {
-    "line_1": { "type": "string", "default": "{{ count }} item • {{ amount, price }}" },
-    "line_1_plural": { "type": "string", "default": "{{ count }} items • {{ amount, price }}" },
-    "line_1_approximate": {
-      "type": "string",
-      "default": "At least 20 items • {{ amount, price }}"
-    },
+    "line_1": { "type": "string", "default": "ID {{ id }} • {{ amount, price }}" },
     "line_2_one": { "type": "string", "default": "{{ name }}" },
     "line_2_many": { "type": "string", "default": "{{ name }} + more" },
     "line_2_empty": { "type": "string", "default": "Empty cart" },
@@ -25,8 +20,6 @@
   },
   "required": [
     "line_1",
-    "line_1_plural",
-    "line_1_approximate",
     "line_2_one",
     "line_2_many",
     "line_2_empty",
diff --git a/src/static/schemas/customer-portal.json b/src/static/schemas/customer-portal.json
index 9eafb8ab5..c3ea59324 100644
--- a/src/static/schemas/customer-portal.json
+++ b/src/static/schemas/customer-portal.json
@@ -61,6 +61,56 @@
           "default": "Looks like you didn't save your changes! What would you like to do with them?"
         },
         "update": { "type": "string", "default": "Update" },
+        "transactions-table": {
+          "additionalProperties": false,
+          "properties": {
+            "date": { "type": "string", "default": "{{value, date}}" },
+            "price": { "type": "string", "default": "{{amount, price}}" },
+            "receipt": { "type": "string", "default": "Receipt" },
+            "transaction_approved": { "type": "string", "default": "Approved" },
+            "transaction_authorized": { "type": "string", "default": "Authorized" },
+            "transaction_captured": { "type": "string", "default": "Captured" },
+            "transaction_completed": { "type": "string", "default": "Completed" },
+            "transaction_declined": { "type": "string", "default": "Declined" },
+            "transaction_pending": { "type": "string", "default": "Pending" },
+            "transaction_refunded": { "type": "string", "default": "Refunded" },
+            "transaction_rejected": { "type": "string", "default": "Rejected" },
+            "transaction_summary": { "type": "string", "default": "{{most_expensive_item.name}}" },
+            "transaction_summary_plural": {
+              "type": "string",
+              "default": "{{most_expensive_item.name}} and {{count_minus_one}} more"
+            },
+            "transaction_verified": { "type": "string", "default": "Verified" },
+            "transaction_voided": { "type": "string", "default": "Voided" },
+            "spinner": {
+              "additionalProperties": false,
+              "properties": {
+                "loading_busy": { "type": "string", "default": "Loading" },
+                "loading_empty": { "type": "string", "default": "No data" },
+                "loading_error": { "type": "string", "default": "Failed to load" }
+              },
+              "required": ["loading_busy", "loading_empty", "loading_error"]
+            }
+          },
+          "required": [
+            "date",
+            "price",
+            "receipt",
+            "transaction_approved",
+            "transaction_authorized",
+            "transaction_captured",
+            "transaction_completed",
+            "transaction_declined",
+            "transaction_pending",
+            "transaction_refunded",
+            "transaction_rejected",
+            "transaction_summary",
+            "transaction_summary_plural",
+            "transaction_verified",
+            "transaction_voided",
+            "spinner"
+          ]
+        },
         "address-card": {
           "additionalProperties": false,
           "properties": {
@@ -1568,6 +1618,11 @@
               "default": "Starts on {{date, date}}"
             },
             "transaction_summary": { "type": "string", "default": "{{most_expensive_item.name}}" },
+            "fees_hint": { "type": "string", "default": "inc. shipping, taxes, etc." },
+            "fees_explainer": {
+              "type": "string",
+              "default": "Taxes, shipping, and discounts may change the amount charged."
+            },
             "twice_a_month": { "type": "string", "default": "twice a month" },
             "weekly": { "type": "string", "default": "/ week" },
             "weekly_plural": { "type": "string", "default": "/ {{count}} weeks" },
@@ -1599,6 +1654,8 @@
             "subscription_will_be_cancelled",
             "subscription_will_be_active",
             "transaction_summary",
+            "fees_hint",
+            "fees_explainer",
             "twice_a_month",
             "weekly",
             "weekly_plural",
@@ -1644,21 +1701,27 @@
             },
             "subscription_active": {
               "type": "string",
-              "default": "Next payment on {{date, date}}"
+              "default": "Including shipping, taxes, etc. Next payment on {{date, date}}."
+            },
+            "subscription_cancelled": {
+              "type": "string",
+              "default": "Including shipping, taxes, etc. Ended on {{date, date}}."
             },
-            "subscription_cancelled": { "type": "string", "default": "Ended on {{date, date}}" },
             "subscription_failed": {
               "type": "string",
-              "default": "Payment failed on {{date, date}}"
+              "default": "Including shipping, taxes, etc. Payment failed on {{date, date}}."
+            },
+            "subscription_inactive": {
+              "type": "string",
+              "default": "Including shipping, taxes, etc. Inactive."
             },
-            "subscription_inactive": { "type": "string", "default": "Inactive" },
             "subscription_will_be_cancelled": {
               "type": "string",
-              "default": "Ends on {{date, date}}"
+              "default": "Including shipping, taxes, etc. Ends on {{date, date}}."
             },
             "subscription_will_be_active": {
               "type": "string",
-              "default": "Starts on {{date, date}}"
+              "default": "Including shipping, taxes, etc. Starts on {{date, date}}."
             },
             "transaction_plural": { "type": "string", "default": "Transactions" },
             "twice_a_month": { "type": "string", "default": "Twice a month" },
@@ -1930,6 +1993,7 @@
         "undo_header",
         "undo_message",
         "update",
+        "transactions-table",
         "address-card",
         "address-form",
         "customer-form",
diff --git a/src/static/schemas/customer.json b/src/static/schemas/customer.json
index 29c7db4a1..c08e59eed 100644
--- a/src/static/schemas/customer.json
+++ b/src/static/schemas/customer.json
@@ -1656,12 +1656,30 @@
           "type": "string",
           "default": "{{amount, price}} $t(subscription-form.twice_a_month, { \"ns\": \"customer\" })"
         },
-        "subscription_active": { "type": "string", "default": "Next payment on {{date, date}}" },
-        "subscription_cancelled": { "type": "string", "default": "Ended on {{date, date}}" },
-        "subscription_failed": { "type": "string", "default": "Payment failed on {{date, date}}" },
-        "subscription_inactive": { "type": "string", "default": "Inactive" },
-        "subscription_will_be_cancelled": { "type": "string", "default": "Ends on {{date, date}}" },
-        "subscription_will_be_active": { "type": "string", "default": "Starts on {{date, date}}" },
+        "subscription_active": {
+          "type": "string",
+          "default": "Including shipping, taxes, etc. Next payment on {{date, date}}."
+        },
+        "subscription_cancelled": {
+          "type": "string",
+          "default": "Including shipping, taxes, etc. Ended on {{date, date}}."
+        },
+        "subscription_failed": {
+          "type": "string",
+          "default": "Including shipping, taxes, etc. Payment failed on {{date, date}}."
+        },
+        "subscription_inactive": {
+          "type": "string",
+          "default": "Including shipping, taxes, etc. Inactive."
+        },
+        "subscription_will_be_cancelled": {
+          "type": "string",
+          "default": "Including shipping, taxes, etc. Ends on {{date, date}}."
+        },
+        "subscription_will_be_active": {
+          "type": "string",
+          "default": "Including shipping, taxes, etc. Starts on {{date, date}}."
+        },
         "transaction_plural": { "type": "string", "default": "Transactions" },
         "twice_a_month": { "type": "string", "default": "Twice a month" },
         "undo_cancel": { "type": "string", "default": "Review" },
diff --git a/src/static/schemas/store-form.json b/src/static/schemas/store-form.json
index 146759aa1..413668a6b 100644
--- a/src/static/schemas/store-form.json
+++ b/src/static/schemas/store-form.json
@@ -347,7 +347,7 @@
         "placeholder": { "type": "string", "default": "https://example.com/thank-you" },
         "helper_text": {
           "type": "string",
-          "default": "By default, we send customers back to the page referrer after completing a purchase. Instead, you can set a specific URL here."
+          "default": "By default, the continue button on the receipt sends the customer to the store domain after completing a purchase. Instead, you can set a specific URL here."
         },
         "v8n_too_long": {
           "type": "string",
diff --git a/src/static/schemas/subscription-card.json b/src/static/schemas/subscription-card.json
index 6386b5625..b366f95be 100644
--- a/src/static/schemas/subscription-card.json
+++ b/src/static/schemas/subscription-card.json
@@ -26,6 +26,11 @@
     "subscription_will_be_cancelled": { "type": "string", "default": "Ends on {{date, date}}" },
     "subscription_will_be_active": { "type": "string", "default": "Starts on {{date, date}}" },
     "transaction_summary": { "type": "string", "default": "{{most_expensive_item.name}}" },
+    "fees_hint": { "type": "string", "default": "inc. shipping, taxes, etc." },
+    "fees_explainer": {
+      "type": "string",
+      "default": "Taxes, shipping, and discounts may change the amount charged."
+    },
     "twice_a_month": { "type": "string", "default": "Twice a month" },
     "weekly": { "type": "string", "default": "Weekly" },
     "weekly_plural": { "type": "string", "default": "Every {{count}} weeks" },
@@ -57,6 +62,8 @@
     "subscription_will_be_cancelled",
     "subscription_will_be_active",
     "transaction_summary",
+    "fees_hint",
+    "fees_explainer",
     "twice_a_month",
     "weekly",
     "weekly_plural",
diff --git a/src/static/schemas/subscription-form.json b/src/static/schemas/subscription-form.json
index 28533badd..95c7a4455 100644
--- a/src/static/schemas/subscription-form.json
+++ b/src/static/schemas/subscription-form.json
@@ -35,12 +35,30 @@
       "type": "string",
       "default": "{{amount, price}} $t(twice_a_month, { \"ns\": \"subscription-form\" })"
     },
-    "subscription_active": { "type": "string", "default": "Next payment on {{date, date}}" },
-    "subscription_cancelled": { "type": "string", "default": "Ended on {{date, date}}" },
-    "subscription_failed": { "type": "string", "default": "Payment failed on {{date, date}}" },
-    "subscription_inactive": { "type": "string", "default": "Inactive" },
-    "subscription_will_be_cancelled": { "type": "string", "default": "Ends on {{date, date}}" },
-    "subscription_will_be_active": { "type": "string", "default": "Starts on {{date, date}}" },
+    "subscription_active": {
+      "type": "string",
+      "default": "Including shipping, taxes, etc. Next payment on {{date, date}}."
+    },
+    "subscription_cancelled": {
+      "type": "string",
+      "default": "Including shipping, taxes, etc. Ended on {{date, date}}."
+    },
+    "subscription_failed": {
+      "type": "string",
+      "default": "Including shipping, taxes, etc. Payment failed on {{date, date}}."
+    },
+    "subscription_inactive": {
+      "type": "string",
+      "default": "Including shipping, taxes, etc. Inactive."
+    },
+    "subscription_will_be_cancelled": {
+      "type": "string",
+      "default": "Including shipping, taxes, etc. Ends on {{date, date}}."
+    },
+    "subscription_will_be_active": {
+      "type": "string",
+      "default": "Including shipping, taxes, etc. Starts on {{date, date}}."
+    },
     "transaction_plural": { "type": "string", "default": "Transactions" },
     "twice_a_month": { "type": "string", "default": "Twice a month" },
     "undo_cancel": { "type": "string", "default": "Review" },
diff --git a/src/static/translations/cart-card/en.json b/src/static/translations/cart-card/en.json
index 588cdaeab..82c322bca 100644
--- a/src/static/translations/cart-card/en.json
+++ b/src/static/translations/cart-card/en.json
@@ -1,7 +1,5 @@
 {
-  "line_1": "{{ count }} item • {{ amount, price }}",
-  "line_1_plural": "{{ count }} items • {{ amount, price }}",
-  "line_1_approximate": "At least 20 items • {{ amount, price }}",
+  "line_1": "ID {{ id }} • {{ amount, price }}",
   "line_2_one": "{{ name }}",
   "line_2_many": "{{ name }} + more",
   "line_2_empty": "Empty cart",
diff --git a/src/static/translations/customer-portal/en.json b/src/static/translations/customer-portal/en.json
index 3f7689e5b..b5027e2e3 100644
--- a/src/static/translations/customer-portal/en.json
+++ b/src/static/translations/customer-portal/en.json
@@ -26,6 +26,28 @@
     "undo_header": "Unsaved changes",
     "undo_message": "Looks like you didn't save your changes! What would you like to do with them?",
     "update": "Update",
+    "transactions-table": {
+      "date": "{{value, date}}",
+      "price": "{{amount, price}}",
+      "receipt": "Receipt",
+      "transaction_approved": "Approved",
+      "transaction_authorized": "Authorized",
+      "transaction_captured": "Captured",
+      "transaction_completed": "Completed",
+      "transaction_declined": "Declined",
+      "transaction_pending": "Pending",
+      "transaction_refunded": "Refunded",
+      "transaction_rejected": "Rejected",
+      "transaction_summary": "{{most_expensive_item.name}}",
+      "transaction_summary_plural": "{{most_expensive_item.name}} and {{count_minus_one}} more",
+      "transaction_verified": "Verified",
+      "transaction_voided": "Voided",
+      "spinner": {
+        "loading_busy": "Loading",
+        "loading_empty": "No data",
+        "loading_error": "Failed to load"
+      }
+    },
     "address-card": {
       "default_billing_address": "Default billing address",
       "default_shipping_address": "Default shipping address",
@@ -734,6 +756,8 @@
       "subscription_will_be_cancelled": "Ends on {{date, date}}",
       "subscription_will_be_active": "Starts on {{date, date}}",
       "transaction_summary": "{{most_expensive_item.name}}",
+      "fees_hint": "inc. shipping, taxes, etc.",
+      "fees_explainer": "Taxes, shipping, and discounts may change the amount charged.",
       "twice_a_month": "twice a month",
       "weekly": "/ week",
       "weekly_plural": "/ {{count}} weeks",
@@ -770,12 +794,12 @@
       "next_transaction_date": "Next transaction date",
       "price_recurring": "{{amount, price}} $t(customer.subscription-form.frequency, { \"count\": \"{{count}}\", \"units\": \"{{units}}\", \"ns\": \"customer-portal\" })",
       "price_twice_a_month": "{{amount, price}} $t(customer.subscription-form.twice_a_month, { \"ns\": \"customer-portal\" })",
-      "subscription_active": "Next payment on {{date, date}}",
-      "subscription_cancelled": "Ended on {{date, date}}",
-      "subscription_failed": "Payment failed on {{date, date}}",
-      "subscription_inactive": "Inactive",
-      "subscription_will_be_cancelled": "Ends on {{date, date}}",
-      "subscription_will_be_active": "Starts on {{date, date}}",
+      "subscription_active": "Including shipping, taxes, etc. Next payment on {{date, date}}.",
+      "subscription_cancelled": "Including shipping, taxes, etc. Ended on {{date, date}}.",
+      "subscription_failed": "Including shipping, taxes, etc. Payment failed on {{date, date}}.",
+      "subscription_inactive": "Including shipping, taxes, etc. Inactive.",
+      "subscription_will_be_cancelled": "Including shipping, taxes, etc. Ends on {{date, date}}.",
+      "subscription_will_be_active": "Including shipping, taxes, etc. Starts on {{date, date}}.",
       "transaction_plural": "Transactions",
       "twice_a_month": "Twice a month",
       "update_billing": "Update billing",
diff --git a/src/static/translations/customer/en.json b/src/static/translations/customer/en.json
index 880879f0e..904e79fe7 100644
--- a/src/static/translations/customer/en.json
+++ b/src/static/translations/customer/en.json
@@ -783,12 +783,12 @@
     "start_date": "Start date",
     "price_recurring": "{{amount, price}} $t(subscription-form.frequency, { \"count\": \"{{count}}\", \"units\": \"{{units}}\", \"ns\": \"customer\" })",
     "price_twice_a_month": "{{amount, price}} $t(subscription-form.twice_a_month, { \"ns\": \"customer\" })",
-    "subscription_active": "Next payment on {{date, date}}",
-    "subscription_cancelled": "Ended on {{date, date}}",
-    "subscription_failed": "Payment failed on {{date, date}}",
-    "subscription_inactive": "Inactive",
-    "subscription_will_be_cancelled": "Ends on {{date, date}}",
-    "subscription_will_be_active": "Starts on {{date, date}}",
+    "subscription_active": "Including shipping, taxes, etc. Next payment on {{date, date}}.",
+    "subscription_cancelled": "Including shipping, taxes, etc. Ended on {{date, date}}.",
+    "subscription_failed": "Including shipping, taxes, etc. Payment failed on {{date, date}}.",
+    "subscription_inactive": "Including shipping, taxes, etc. Inactive.",
+    "subscription_will_be_cancelled": "Including shipping, taxes, etc. Ends on {{date, date}}.",
+    "subscription_will_be_active": "Including shipping, taxes, etc. Starts on {{date, date}}.",
     "transaction_plural": "Transactions",
     "twice_a_month": "Twice a month",
     "undo_cancel": "Review",
diff --git a/src/static/translations/store-form/en.json b/src/static/translations/store-form/en.json
index f60168256..f435a9bfa 100644
--- a/src/static/translations/store-form/en.json
+++ b/src/static/translations/store-form/en.json
@@ -146,7 +146,7 @@
   "receipt-continue-url": {
     "label": "Return URL",
     "placeholder": "https://example.com/thank-you",
-    "helper_text": "By default, we send customers back to the page referrer after completing a purchase. Instead, you can set a specific URL here.",
+    "helper_text": "By default, the continue button on the receipt sends the customer to the store domain after completing a purchase. Instead, you can set a specific URL here.",
     "v8n_too_long": "Please use a URL that is 300 characters or less"
   },
   "app-session-time": {
diff --git a/src/static/translations/subscription-card/en.json b/src/static/translations/subscription-card/en.json
index 45549108b..dfa0ce5e2 100644
--- a/src/static/translations/subscription-card/en.json
+++ b/src/static/translations/subscription-card/en.json
@@ -14,6 +14,8 @@
   "subscription_will_be_cancelled": "Ends on {{date, date}}",
   "subscription_will_be_active": "Starts on {{date, date}}",
   "transaction_summary": "{{most_expensive_item.name}}",
+  "fees_hint": "inc. shipping, taxes, etc.",
+  "fees_explainer": "Taxes, shipping, and discounts may change the amount charged.",
   "twice_a_month": "Twice a month",
   "weekly": "Weekly",
   "weekly_plural": "Every {{count}} weeks",
diff --git a/src/static/translations/subscription-form/en.json b/src/static/translations/subscription-form/en.json
index 53ee7c29d..c91180f54 100644
--- a/src/static/translations/subscription-form/en.json
+++ b/src/static/translations/subscription-form/en.json
@@ -23,12 +23,12 @@
   "start_date": "Start date",
   "price_recurring": "{{amount, price}} $t(frequency, { \"count\": \"{{count}}\", \"units\": \"{{units}}\", \"ns\": \"subscription-form\" })",
   "price_twice_a_month": "{{amount, price}} $t(twice_a_month, { \"ns\": \"subscription-form\" })",
-  "subscription_active": "Next payment on {{date, date}}",
-  "subscription_cancelled": "Ended on {{date, date}}",
-  "subscription_failed": "Payment failed on {{date, date}}",
-  "subscription_inactive": "Inactive",
-  "subscription_will_be_cancelled": "Ends on {{date, date}}",
-  "subscription_will_be_active": "Starts on {{date, date}}",
+  "subscription_active": "Including shipping, taxes, etc. Next payment on {{date, date}}.",
+  "subscription_cancelled": "Including shipping, taxes, etc. Ended on {{date, date}}.",
+  "subscription_failed": "Including shipping, taxes, etc. Payment failed on {{date, date}}.",
+  "subscription_inactive": "Including shipping, taxes, etc. Inactive.",
+  "subscription_will_be_cancelled": "Including shipping, taxes, etc. Ends on {{date, date}}.",
+  "subscription_will_be_active": "Including shipping, taxes, etc. Starts on {{date, date}}.",
   "transaction_plural": "Transactions",
   "twice_a_month": "Twice a month",
   "undo_cancel": "Review",