From 24e3529bd26503807794b5015482e76edaa7af9e Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 09:43:26 +0200
Subject: [PATCH 01/11] Revert "removed FilterBench"

This reverts commit 1a7ae9133bd0c8bf9c0c06bdfa0993226a145ba6.
---
 performance/benchmarks/FilterBench.php | 53 ++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 performance/benchmarks/FilterBench.php

diff --git a/performance/benchmarks/FilterBench.php b/performance/benchmarks/FilterBench.php
new file mode 100644
index 0000000..38270a3
--- /dev/null
+++ b/performance/benchmarks/FilterBench.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\benchmarks;
+
+use Keepsuit\Liquid\Environment;
+use Keepsuit\Liquid\EnvironmentFactory;
+use Keepsuit\Liquid\Template;
+use PhpBench\Attributes\BeforeMethods;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\OutputMode;
+use PhpBench\Attributes\OutputTimeUnit;
+use PhpBench\Attributes\Revs;
+
+#[Iterations(10)]
+#[Revs(20)]
+#[OutputMode('throughput')]
+#[OutputTimeUnit('seconds', precision: 3)]
+#[BeforeMethods('setUp')]
+class FilterBench
+{
+    private Environment $environment;
+
+    private Template $noArgumentsTemplate;
+
+    private Template $argumentsTemplate;
+
+    public function setUp(): void
+    {
+        $this->environment = EnvironmentFactory::new()->build();
+        $this->noArgumentsTemplate = $this->environment->parseString(str_repeat('{{ value | upcase | escape }}', 32));
+        $this->argumentsTemplate = $this->environment->parseString(str_repeat('{{ value | append: suffix | replace: from, to }}', 32));
+    }
+
+    public function benchNoArguments(): void
+    {
+        $this->noArgumentsTemplate->render($this->context());
+    }
+
+    public function benchArguments(): void
+    {
+        $this->argumentsTemplate->render($this->context());
+    }
+
+    private function context(): \Keepsuit\Liquid\Render\RenderContext
+    {
+        return $this->environment->newRenderContext(staticData: [
+            'value' => 'example',
+            'suffix' => '-suffix',
+            'from' => 'example',
+            'to' => 'value',
+        ]);
+    }
+}

From 6811cb3cc3e9bb9b7a385803cae6fe8bf24fbdfc Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 10:39:56 +0200
Subject: [PATCH 02/11] Revamp benchmark suite

---
 .github/workflows/phpbench.yml                |   9 +-
 composer.json                                 |   3 +-
 performance/ProfileReport.php                 |  55 ++++++
 performance/benchmarks/FilterBench.php        |  53 ------
 performance/benchmarks/LiquidBench.php        |  70 --------
 .../{RenderBench.php => OperationBench.php}   |  30 +++-
 .../Support/ComplexThemeFixture.php           | 126 +++++++++++++
 performance/benchmarks/TemplateCacheBench.php | 167 +++++++++++-------
 performance/benchmarks/ThemeBench.php         |  63 +++++++
 performance/profile-theme.php                 |  62 +++++++
 .../Performance/ComplexThemeFixtureTest.php   |  23 +++
 tests/Unit/Performance/ProfileReportTest.php  |  43 +++++
 tools/phpbench-compare.php                    |   4 +-
 13 files changed, 510 insertions(+), 198 deletions(-)
 create mode 100644 performance/ProfileReport.php
 delete mode 100644 performance/benchmarks/FilterBench.php
 delete mode 100644 performance/benchmarks/LiquidBench.php
 rename performance/benchmarks/{RenderBench.php => OperationBench.php} (70%)
 create mode 100644 performance/benchmarks/Support/ComplexThemeFixture.php
 create mode 100644 performance/benchmarks/ThemeBench.php
 create mode 100644 performance/profile-theme.php
 create mode 100644 tests/Integration/Performance/ComplexThemeFixtureTest.php
 create mode 100644 tests/Unit/Performance/ProfileReportTest.php

diff --git a/.github/workflows/phpbench.yml b/.github/workflows/phpbench.yml
index 78344a7..b61d731 100644
--- a/.github/workflows/phpbench.yml
+++ b/.github/workflows/phpbench.yml
@@ -14,11 +14,11 @@ permissions:
 
 env:
   REQUIRED_PHP_EXTENSIONS: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-  # TemplateCacheBench::benchVarExporter segfaults on CI for PHP 8.4/8.5. Exclude it on
+  # TemplateCacheBench::benchLoadAndRenderVarExporter segfaults on CI for PHP 8.4/8.5. Exclude it on
   # every version, not just those two: a benchmark set that varies per PHP version makes
   # the per-version comparison summaries incomparable with each other. Local runs are
   # unfiltered, so the benchmark still exists — it just does not gate PRs.
-  PHPBENCH_FILTER: '^(?!.*TemplateCacheBench::benchVarExporter$).*'
+  PHPBENCH_FILTER: '^(?!.*TemplateCacheBench::benchLoadAndRenderVarExporter$).*'
 
 jobs:
   benchmark:
@@ -78,9 +78,9 @@ jobs:
           set -euo pipefail
 
           vendor/bin/phpbench run \
+            --group=macro \
             --filter="$PHPBENCH_FILTER" \
             --progress=none \
-            --warmup=1 \
             --retry-threshold=5 \
             --report=aggregate \
             --output=json > "$WORKSPACE/pr.json"
@@ -93,7 +93,6 @@ jobs:
           vendor/bin/phpbench run \
             --filter="$PHPBENCH_FILTER" \
             --progress=none \
-            --warmup=1 \
             --retry-threshold=5 \
             --report=aggregate \
             --output=json > "$WORKSPACE/base.json"
@@ -106,7 +105,7 @@ jobs:
           PHPBENCH_PHP_VERSION: ${{ matrix.php }}
           PHPBENCH_BASE_SHA: ${{ github.event.pull_request.base.sha }}
           PHPBENCH_PR_SHA: ${{ github.event.pull_request.head.sha }}
-          PHPBENCH_WARMUP: '1'
+          PHPBENCH_WARMUP: '0'
         run: |
           set +e
           export PHPBENCH_RUNNER="${ImageOS:-$RUNNER_OS}"
diff --git a/composer.json b/composer.json
index 90ca7c8..2bb7f99 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,8 @@
             "pint",
             "phpstan analyse"
         ],
-        "benchmark": "phpbench run --report=aggregate",
+        "benchmark": "phpbench run --group=macro --report=aggregate",
+        "benchmark:micro": "phpbench run --group=micro --report=aggregate",
         "profile": "phpbench xdebug:profile"
     },
     "config": {
diff --git a/performance/ProfileReport.php b/performance/ProfileReport.php
new file mode 100644
index 0000000..ef3bbdc
--- /dev/null
+++ b/performance/ProfileReport.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance;
+
+use Keepsuit\Liquid\Profiler\Profile;
+use Keepsuit\Liquid\Profiler\Profiler;
+
+final class ProfileReport
+{
+    /**
+     * Convert the profiler tree into a stable, machine-readable diagnostic report.
+     *
+     * Durations are measured in seconds; memory values are byte deltas.
+     *
+     * @return array{
+     *     schema_version: int,
+     *     generated_at: string,
+     *     php_version: string,
+     *     profiles: array<int, array<string, mixed>>
+     * }
+     */
+    public static function fromProfiler(Profiler $profiler): array
+    {
+        return [
+            'schema_version' => 1,
+            'generated_at' => date(DATE_ATOM),
+            'php_version' => PHP_VERSION,
+            'profiles' => array_map(self::profile(...), $profiler->getProfiles()),
+        ];
+    }
+
+    /**
+     * @return array{
+     *     type: string,
+     *     name: string,
+     *     duration: float,
+     *     self_duration: float,
+     *     memory_usage: int,
+     *     peak_memory_usage: int,
+     *     children: array<int, array<string, mixed>>
+     * }
+     */
+    private static function profile(Profile $profile): array
+    {
+        return [
+            'type' => $profile->type->value,
+            'name' => $profile->name,
+            'duration' => $profile->getDuration(),
+            'self_duration' => $profile->getSelfDuration(),
+            'memory_usage' => $profile->getMemoryUsage(),
+            'peak_memory_usage' => $profile->getPeakMemoryUsage(),
+            'children' => array_map(self::profile(...), $profile->getChildren()),
+        ];
+    }
+}
diff --git a/performance/benchmarks/FilterBench.php b/performance/benchmarks/FilterBench.php
deleted file mode 100644
index 38270a3..0000000
--- a/performance/benchmarks/FilterBench.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance\benchmarks;
-
-use Keepsuit\Liquid\Environment;
-use Keepsuit\Liquid\EnvironmentFactory;
-use Keepsuit\Liquid\Template;
-use PhpBench\Attributes\BeforeMethods;
-use PhpBench\Attributes\Iterations;
-use PhpBench\Attributes\OutputMode;
-use PhpBench\Attributes\OutputTimeUnit;
-use PhpBench\Attributes\Revs;
-
-#[Iterations(10)]
-#[Revs(20)]
-#[OutputMode('throughput')]
-#[OutputTimeUnit('seconds', precision: 3)]
-#[BeforeMethods('setUp')]
-class FilterBench
-{
-    private Environment $environment;
-
-    private Template $noArgumentsTemplate;
-
-    private Template $argumentsTemplate;
-
-    public function setUp(): void
-    {
-        $this->environment = EnvironmentFactory::new()->build();
-        $this->noArgumentsTemplate = $this->environment->parseString(str_repeat('{{ value | upcase | escape }}', 32));
-        $this->argumentsTemplate = $this->environment->parseString(str_repeat('{{ value | append: suffix | replace: from, to }}', 32));
-    }
-
-    public function benchNoArguments(): void
-    {
-        $this->noArgumentsTemplate->render($this->context());
-    }
-
-    public function benchArguments(): void
-    {
-        $this->argumentsTemplate->render($this->context());
-    }
-
-    private function context(): \Keepsuit\Liquid\Render\RenderContext
-    {
-        return $this->environment->newRenderContext(staticData: [
-            'value' => 'example',
-            'suffix' => '-suffix',
-            'from' => 'example',
-            'to' => 'value',
-        ]);
-    }
-}
diff --git a/performance/benchmarks/LiquidBench.php b/performance/benchmarks/LiquidBench.php
deleted file mode 100644
index 53719ce..0000000
--- a/performance/benchmarks/LiquidBench.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance\benchmarks;
-
-use Keepsuit\Liquid\EnvironmentFactory;
-use Keepsuit\Liquid\Performance\Shopify\CommentFormTag;
-use Keepsuit\Liquid\Performance\Shopify\CustomFilters;
-use Keepsuit\Liquid\Performance\Shopify\PaginateTag;
-use Keepsuit\Liquid\Performance\ThemeRunner;
-use PhpBench\Attributes\BeforeMethods;
-use PhpBench\Attributes\Iterations;
-use PhpBench\Attributes\OutputMode;
-use PhpBench\Attributes\OutputTimeUnit;
-use PhpBench\Attributes\Revs;
-
-#[Iterations(10)]
-#[Revs(10)]
-#[OutputMode('throughput')]
-#[OutputTimeUnit('seconds', precision: 3)]
-#[BeforeMethods('setUp')]
-class LiquidBench
-{
-    protected ThemeRunner $themeRunner;
-
-    public function setUp(): void
-    {
-        $this->themeRunner = $this->getThemeRunner();
-    }
-
-    public function benchTokenize(): void
-    {
-        $this->themeRunner->tokenize();
-    }
-
-    public function benchParsing(): void
-    {
-        $this->themeRunner->compile();
-    }
-
-    public function benchRender(): void
-    {
-        $this->themeRunner->render();
-    }
-
-    public function benchStream(): void
-    {
-        $this->themeRunner->stream();
-    }
-
-    public function benchParsingAndRendering(): void
-    {
-        $this->themeRunner->run();
-    }
-
-    public function benchParsingAndStreaming(): void
-    {
-        $this->themeRunner->runStreaming();
-    }
-
-    protected function getThemeRunner(): ThemeRunner
-    {
-        $environment = EnvironmentFactory::new()
-            ->registerTag(CommentFormTag::class)
-            ->registerTag(PaginateTag::class)
-            ->registerFilters(CustomFilters::class)
-            ->build();
-
-        return new ThemeRunner($environment);
-    }
-}
diff --git a/performance/benchmarks/RenderBench.php b/performance/benchmarks/OperationBench.php
similarity index 70%
rename from performance/benchmarks/RenderBench.php
rename to performance/benchmarks/OperationBench.php
index edc819e..fa2b8d0 100644
--- a/performance/benchmarks/RenderBench.php
+++ b/performance/benchmarks/OperationBench.php
@@ -7,17 +7,19 @@
 use Keepsuit\Liquid\Performance\Shopify\DatabaseDrop;
 use Keepsuit\Liquid\Template;
 use PhpBench\Attributes\BeforeMethods;
+use PhpBench\Attributes\Groups;
 use PhpBench\Attributes\Iterations;
 use PhpBench\Attributes\OutputMode;
 use PhpBench\Attributes\OutputTimeUnit;
 use PhpBench\Attributes\Revs;
 
+#[Groups(['micro'])]
 #[Iterations(10)]
 #[Revs(20)]
 #[OutputMode('throughput')]
 #[OutputTimeUnit('seconds', precision: 3)]
 #[BeforeMethods('setUp')]
-class RenderBench
+class OperationBench
 {
     private Environment $environment;
 
@@ -25,11 +27,17 @@ class RenderBench
 
     private Template $nestedTemplate;
 
+    private Template $filterWithoutArgumentsTemplate;
+
+    private Template $filterWithArgumentsTemplate;
+
     public function setUp(): void
     {
         $this->environment = EnvironmentFactory::new()->build();
         $this->scalarTemplate = $this->environment->parseString(str_repeat('{{ value }}', 64));
         $this->nestedTemplate = $this->environment->parseString(str_repeat('{{ product.title }}', 64));
+        $this->filterWithoutArgumentsTemplate = $this->environment->parseString(str_repeat('{{ value | upcase | escape }}', 32));
+        $this->filterWithArgumentsTemplate = $this->environment->parseString(str_repeat('{{ value | append: suffix | replace: from, to }}', 32));
     }
 
     public function benchScalarRender(): void
@@ -74,6 +82,16 @@ public function benchDropStream(): void
         )));
     }
 
+    public function benchFilterWithoutArguments(): void
+    {
+        $this->filterWithoutArgumentsTemplate->render($this->filterContext());
+    }
+
+    public function benchFilterWithArguments(): void
+    {
+        $this->filterWithArgumentsTemplate->render($this->filterContext());
+    }
+
     /**
      * @param  \Generator<string>  $stream
      */
@@ -83,4 +101,14 @@ private function drain(\Generator $stream): void
             $stream->next();
         }
     }
+
+    private function filterContext(): \Keepsuit\Liquid\Render\RenderContext
+    {
+        return $this->environment->newRenderContext(staticData: [
+            'value' => 'example',
+            'suffix' => '-suffix',
+            'from' => 'example',
+            'to' => 'value',
+        ]);
+    }
 }
diff --git a/performance/benchmarks/Support/ComplexThemeFixture.php b/performance/benchmarks/Support/ComplexThemeFixture.php
new file mode 100644
index 0000000..ade0a3b
--- /dev/null
+++ b/performance/benchmarks/Support/ComplexThemeFixture.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\benchmarks\Support;
+
+use Keepsuit\Liquid\Attributes\Cache;
+use Keepsuit\Liquid\Contracts\LiquidFileSystem;
+use Keepsuit\Liquid\Contracts\LiquidTemplatesCache;
+use Keepsuit\Liquid\Drop;
+use Keepsuit\Liquid\Environment;
+use Keepsuit\Liquid\EnvironmentFactory;
+use Keepsuit\Liquid\Filters\FiltersProvider;
+use Keepsuit\Liquid\Render\RenderContext;
+
+final class ComplexThemeFixture
+{
+    public const ROOT_TEMPLATE_NAME = 'collection-page';
+
+    public static function environment(?LiquidTemplatesCache $templatesCache = null): Environment
+    {
+        $factory = EnvironmentFactory::new()
+            ->setFilesystem(new ComplexThemeFileSystem(self::templateSources()))
+            ->registerFilters(ComplexThemeFilters::class);
+
+        if ($templatesCache !== null) {
+            $factory->setTemplatesCache($templatesCache);
+        }
+
+        return $factory->build();
+    }
+
+    public static function rootTemplateName(): string
+    {
+        return self::ROOT_TEMPLATE_NAME;
+    }
+
+    public static function rootTemplateSource(): string
+    {
+        return self::templateSources()[self::ROOT_TEMPLATE_NAME];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public static function templateSources(): array
+    {
+        return [
+            self::ROOT_TEMPLATE_NAME => '{% render "page-shell", collection: collection %}',
+            'page-shell' => "<main data-collection=\"{{ collection.handle }}\">\n  {% render \"collection-section\", collection: collection %}\n</main>",
+            'collection-section' => "<header><h1>{{ collection.title }}</h1><p>{{ collection.products | size }} products</p></header>\n  <section class=\"products\">\n{% for product in collection.products %}    {% render \"product-card\", product: product, label: collection.label %}\n{% endfor %}  </section>",
+            'product-card' => '<article data-handle="{{ product.handle }}"><h2>{{ product.title }}</h2><p class="vendor">{{ product.vendor | upcase }}</p><p class="price">{{ product.price_cents | fixture_money }}</p><p class="label">{{ label }}</p><p class="summary">{{ product.title }} / {{ product.vendor }} / {{ product.inventory_label }} | {{ product.title }} / {{ product.vendor }} / {{ product.inventory_label }}</p></article>',
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public static function renderData(): array
+    {
+        return [
+            'collection' => [
+                'handle' => 'summer-essentials',
+                'title' => 'Summer Essentials',
+                'label' => 'summer',
+                'products' => [
+                    new ComplexThemeProduct('linen-shirt', 'Linen Shirt', 'ACME Apparel', 3950),
+                    new ComplexThemeProduct('canvas-tote', 'Canvas Tote', 'Field Goods', 2400),
+                    new ComplexThemeProduct('sun-hat', 'Sun Hat', 'Coastline', 1875),
+                ],
+            ],
+        ];
+    }
+
+    public static function newRenderContext(Environment $environment): RenderContext
+    {
+        return $environment->newRenderContext(staticData: self::renderData());
+    }
+}
+
+final class ComplexThemeFileSystem implements LiquidFileSystem
+{
+    /**
+     * @param  array<string, string>  $templates
+     */
+    public function __construct(
+        private readonly array $templates,
+    ) {}
+
+    public function readTemplateFile(string $templateName): string
+    {
+        return $this->templates[$templateName] ?? throw new \RuntimeException("Unknown fixture template [$templateName].");
+    }
+}
+
+final class ComplexThemeFilters extends FiltersProvider
+{
+    public function fixtureMoney(int|float $cents): string
+    {
+        return '€'.number_format($cents / 100, 2, '.', '');
+    }
+}
+
+final class ComplexThemeProduct extends Drop
+{
+    public function __construct(
+        public readonly string $handle,
+        public readonly string $title,
+        private readonly string $vendorName,
+        private readonly int $priceCents,
+    ) {}
+
+    public function vendor(): string
+    {
+        return $this->vendorName;
+    }
+
+    public function priceCents(): int
+    {
+        return $this->priceCents;
+    }
+
+    #[Cache]
+    public function inventoryLabel(): int
+    {
+        return $this->priceCents;
+    }
+}
diff --git a/performance/benchmarks/TemplateCacheBench.php b/performance/benchmarks/TemplateCacheBench.php
index fc2e348..a58330d 100644
--- a/performance/benchmarks/TemplateCacheBench.php
+++ b/performance/benchmarks/TemplateCacheBench.php
@@ -2,125 +2,160 @@
 
 namespace Keepsuit\Liquid\Performance\benchmarks;
 
+use Keepsuit\Liquid\Contracts\LiquidTemplatesCache;
 use Keepsuit\Liquid\Environment;
-use Keepsuit\Liquid\EnvironmentFactory;
-use Keepsuit\Liquid\FileSystems\LocalFileSystem;
-use Keepsuit\Liquid\Performance\Shopify\CommentFormTag;
-use Keepsuit\Liquid\Performance\Shopify\CustomFilters;
-use Keepsuit\Liquid\Performance\Shopify\Database;
-use Keepsuit\Liquid\Performance\Shopify\PaginateTag;
-use Keepsuit\Liquid\Support\Arr;
+use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
 use Keepsuit\Liquid\TemplatesCache\MemoryTemplatesCache;
 use Keepsuit\Liquid\TemplatesCache\SerializeTemplatesCache;
 use Keepsuit\Liquid\TemplatesCache\VarExportTemplatesCache;
 use PhpBench\Attributes\AfterMethods;
 use PhpBench\Attributes\BeforeMethods;
+use PhpBench\Attributes\Groups;
 use PhpBench\Attributes\Iterations;
 use PhpBench\Attributes\OutputMode;
 use PhpBench\Attributes\OutputTimeUnit;
 use PhpBench\Attributes\Revs;
-use PhpBench\Attributes\Warmup;
 
-#[Iterations(10)]
-#[Revs(10)]
-#[Warmup(1)]
+#[Groups(['macro'])]
+#[Iterations(20)]
+#[Revs(100)]
 #[OutputMode('throughput')]
 #[OutputTimeUnit('seconds', precision: 3)]
 #[AfterMethods('clearCache')]
 class TemplateCacheBench
 {
-    protected Environment $environment;
+    private const CACHE_DIRECTORY = 'keepsuit-liquid-phpbench';
 
-    protected array $templates;
+    private Environment $environment;
 
-    #[BeforeMethods('setupInMemory')]
-    public function benchInMemory(): void
+    private LiquidTemplatesCache $cache;
+
+    #[BeforeMethods('setUpInMemoryBuild')]
+    #[Revs(1000)]
+    public function benchBuildInMemory(): void
     {
-        $this->renderTemplates();
+        $this->buildStaticTheme();
     }
 
-    public function setupInMemory(): void
+    #[BeforeMethods('setUpInMemoryCachedRender')]
+    #[Revs(1000)]
+    public function benchLoadAndRenderInMemory(): void
     {
-        $this->environment = $this->environmentBuilder()
-            ->setTemplatesCache(new MemoryTemplatesCache)
-            ->build();
+        $this->renderCachedTheme();
+    }
 
-        $this->loadTemplates();
+    #[BeforeMethods('setUpSerializeBuild')]
+    #[Revs(500)]
+    public function benchBuildSerialize(): void
+    {
+        $this->buildStaticTheme();
     }
 
-    #[BeforeMethods('setupVarExporter')]
-    public function benchVarExporter(): void
+    #[BeforeMethods('setUpSerializeCachedRender')]
+    #[Revs(1000)]
+    public function benchLoadAndRenderSerialize(): void
     {
-        $this->renderTemplates();
+        $this->renderCachedTheme();
     }
 
-    public function setupVarExporter(): void
+    #[BeforeMethods('setUpVarExporterBuild')]
+    #[Revs(1000)]
+    public function benchBuildVarExporter(): void
     {
-        $this->environment = $this->environmentBuilder()
-            ->setTemplatesCache(new VarExportTemplatesCache(__DIR__.'/cache/var_export', keepInMemory: false))
-            ->build();
+        $this->buildStaticTheme();
+    }
 
-        $this->loadTemplates();
+    #[BeforeMethods('setUpVarExporterCachedRender')]
+    #[Revs(1000)]
+    public function benchLoadAndRenderVarExporter(): void
+    {
+        $this->renderCachedTheme();
     }
 
-    #[BeforeMethods('setupSerialize')]
-    public function benchSerialize(): void
+    public function setUpInMemoryBuild(): void
     {
-        $this->renderTemplates();
+        $this->setUpBuild('memory');
     }
 
-    public function setupSerialize(): void
+    public function setUpInMemoryCachedRender(): void
     {
-        $this->environment = $this->environmentBuilder()
-            ->setTemplatesCache(new SerializeTemplatesCache(__DIR__.'/cache/serialize', keepInMemory: false))
-            ->build();
+        $this->setUpCachedRender('memory');
+    }
 
-        $this->loadTemplates();
+    public function setUpSerializeBuild(): void
+    {
+        $this->setUpBuild('serialize');
     }
 
-    protected function loadTemplates(): void
+    public function setUpSerializeCachedRender(): void
     {
-        $baseDir = __DIR__.'/../tests';
-        $files = glob($baseDir.'/**/*.liquid');
+        $this->setUpCachedRender('serialize');
+    }
 
-        if ($files === false) {
-            throw new \RuntimeException('Could not find any tests');
-        }
+    public function setUpVarExporterBuild(): void
+    {
+        $this->setUpBuild('var-exporter');
+    }
 
-        $this->templates = Arr::map($files, function (string $path) use ($baseDir) {
-            // relative path to the base directory
-            $name = str_replace($baseDir.'/', '', $path);
-            // remove .liquid extension
-            $name = substr($name, 0, -7);
+    public function setUpVarExporterCachedRender(): void
+    {
+        $this->setUpCachedRender('var-exporter');
+    }
 
-            // replace / with .
-            return str_replace('/', '.', $name);
-        });
+    public function clearCache(): void
+    {
+        $this->cache->clear();
+    }
 
-        foreach ($this->templates as $template) {
-            $this->environment->parseTemplate($template);
-        }
+    private function setUpBuild(string $backend): void
+    {
+        $this->cache = $this->newCache($backend);
+        $this->cache->clear();
+        $this->environment = ComplexThemeFixture::environment($this->cache);
     }
 
-    protected function environmentBuilder(): EnvironmentFactory
+    private function setUpCachedRender(string $backend): void
     {
-        return EnvironmentFactory::new()
-            ->setFilesystem(new LocalFileSystem(__DIR__.'/../tests'))
-            ->registerTag(CommentFormTag::class)
-            ->registerTag(PaginateTag::class)
-            ->registerFilters(CustomFilters::class);
+        $this->setUpBuild($backend);
+        $this->compileStaticTheme($this->environment);
+
+        $this->cache = $backend === 'memory'
+            ? $this->cache
+            : $this->newCache($backend);
+        $this->environment = ComplexThemeFixture::environment($this->cache);
     }
 
-    protected function renderTemplates(): void
+    private function compileStaticTheme(Environment $environment): void
     {
-        foreach ($this->templates as $template) {
-            $this->environment->parseTemplate($template)
-                ->render($this->environment->newRenderContext(staticData: [...Database::tables()]));
+        foreach (array_keys(ComplexThemeFixture::templateSources()) as $templateName) {
+            $environment->parseTemplate($templateName);
         }
     }
 
-    public function clearCache(): void
+    private function buildStaticTheme(): void
+    {
+        $this->cache->clear();
+        $this->compileStaticTheme($this->environment);
+    }
+
+    private function renderCachedTheme(): void
+    {
+        $this->environment->parseTemplate(ComplexThemeFixture::rootTemplateName())
+            ->render(ComplexThemeFixture::newRenderContext($this->environment));
+    }
+
+    private function newCache(string $backend): LiquidTemplatesCache
+    {
+        return match ($backend) {
+            'memory' => new MemoryTemplatesCache,
+            'serialize' => new SerializeTemplatesCache($this->cachePath('serialize'), keepInMemory: false),
+            'var-exporter' => new VarExportTemplatesCache($this->cachePath('var-exporter'), keepInMemory: false),
+            default => throw new \InvalidArgumentException("Unknown templates cache backend [$backend]."),
+        };
+    }
+
+    private function cachePath(string $backend): string
     {
-        $this->environment->templatesCache->clear();
+        return sys_get_temp_dir().'/'.self::CACHE_DIRECTORY.'/'.$backend;
     }
 }
diff --git a/performance/benchmarks/ThemeBench.php b/performance/benchmarks/ThemeBench.php
new file mode 100644
index 0000000..e6811d1
--- /dev/null
+++ b/performance/benchmarks/ThemeBench.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\benchmarks;
+
+use Keepsuit\Liquid\Environment;
+use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
+use Keepsuit\Liquid\Template;
+use PhpBench\Attributes\BeforeMethods;
+use PhpBench\Attributes\Groups;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\OutputMode;
+use PhpBench\Attributes\OutputTimeUnit;
+use PhpBench\Attributes\Revs;
+
+#[Groups(['macro'])]
+#[Iterations(20)]
+#[Revs(1000)]
+#[OutputMode('throughput')]
+#[OutputTimeUnit('seconds', precision: 3)]
+#[BeforeMethods('setUp')]
+class ThemeBench
+{
+    private Environment $environment;
+
+    private Template $template;
+
+    public function setUp(): void
+    {
+        $this->environment = ComplexThemeFixture::environment();
+
+        foreach (array_keys(ComplexThemeFixture::templateSources()) as $name) {
+            $this->environment->parseTemplate($name);
+        }
+
+        $this->template = $this->environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
+    }
+
+    public function benchTokenize(): void
+    {
+        foreach (ComplexThemeFixture::templateSources() as $source) {
+            $this->environment->newParseContext()->tokenize($source);
+        }
+    }
+
+    public function benchParse(): void
+    {
+        foreach (ComplexThemeFixture::templateSources() as $name => $source) {
+            $this->environment->parseString($source, $name);
+        }
+    }
+
+    public function benchRender(): void
+    {
+        $this->template->render(ComplexThemeFixture::newRenderContext($this->environment));
+    }
+
+    #[Revs(1500)]
+    public function benchStream(): void
+    {
+        foreach ($this->template->stream(ComplexThemeFixture::newRenderContext($this->environment)) as $chunk) {
+        }
+    }
+}
diff --git a/performance/profile-theme.php b/performance/profile-theme.php
new file mode 100644
index 0000000..c3125de
--- /dev/null
+++ b/performance/profile-theme.php
@@ -0,0 +1,62 @@
+<?php
+
+use Keepsuit\Liquid\Extensions\ProfilerExtension;
+use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
+use Keepsuit\Liquid\Performance\ProfileReport;
+use Keepsuit\Liquid\Profiler\Profiler;
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+$outputPath = null;
+/** @var list<string> $arguments */
+$arguments = $_SERVER['argv'] ?? [];
+for ($argumentIndex = 1; $argumentIndex < count($arguments); $argumentIndex++) {
+    $argument = $arguments[$argumentIndex];
+
+    if ($argument === '--help') {
+        fwrite(STDOUT, "Usage: php performance/profile-theme.php [--output=profile.json]\n");
+        exit(0);
+    }
+
+    if ($argument === '--output') {
+        $outputPath = $arguments[++$argumentIndex] ?? null;
+    } elseif (str_starts_with($argument, '--output=')) {
+        $outputPath = substr($argument, strlen('--output='));
+    } else {
+        fwrite(STDERR, "Unknown argument: {$argument}\n");
+        exit(1);
+    }
+
+    if (! is_string($outputPath) || $outputPath === '') {
+        fwrite(STDERR, "The --output option requires a path.\n");
+        exit(1);
+    }
+}
+
+$environment = ComplexThemeFixture::environment();
+$environment->addExtension(new ProfilerExtension(
+    profiler: $profiler = new Profiler,
+    tags: true,
+    variables: true,
+));
+
+$template = $environment->parseString(
+    source: ComplexThemeFixture::rootTemplateSource(),
+    name: ComplexThemeFixture::rootTemplateName(),
+);
+$template->render(ComplexThemeFixture::newRenderContext($environment));
+
+$report = ProfileReport::fromProfiler($profiler);
+$json = json_encode($report, JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR).PHP_EOL;
+
+if ($outputPath === null) {
+    fwrite(STDOUT, $json);
+    exit(0);
+}
+
+if (file_put_contents($outputPath, $json) === false) {
+    fwrite(STDERR, "Could not write profile report to {$outputPath}.\n");
+    exit(1);
+}
+
+fwrite(STDOUT, "Profile report written to {$outputPath}\n");
diff --git a/tests/Integration/Performance/ComplexThemeFixtureTest.php b/tests/Integration/Performance/ComplexThemeFixtureTest.php
new file mode 100644
index 0000000..8829b2c
--- /dev/null
+++ b/tests/Integration/Performance/ComplexThemeFixtureTest.php
@@ -0,0 +1,23 @@
+<?php
+
+use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
+
+test('complex theme fixture renders the deterministic collection page', function () {
+    $environment = ComplexThemeFixture::environment();
+
+    $template = $environment->parseString(
+        ComplexThemeFixture::rootTemplateSource(),
+        ComplexThemeFixture::rootTemplateName(),
+    );
+
+    expect($template->render(ComplexThemeFixture::newRenderContext($environment)))->toBe(<<<'HTML'
+<main data-collection="summer-essentials">
+  <header><h1>Summer Essentials</h1><p>3 products</p></header>
+  <section class="products">
+    <article data-handle="linen-shirt"><h2>Linen Shirt</h2><p class="vendor">ACME APPAREL</p><p class="price">€39.50</p><p class="label">summer</p><p class="summary">Linen Shirt / ACME Apparel / 3950 | Linen Shirt / ACME Apparel / 3950</p></article>
+    <article data-handle="canvas-tote"><h2>Canvas Tote</h2><p class="vendor">FIELD GOODS</p><p class="price">€24.00</p><p class="label">summer</p><p class="summary">Canvas Tote / Field Goods / 2400 | Canvas Tote / Field Goods / 2400</p></article>
+    <article data-handle="sun-hat"><h2>Sun Hat</h2><p class="vendor">COASTLINE</p><p class="price">€18.75</p><p class="label">summer</p><p class="summary">Sun Hat / Coastline / 1875 | Sun Hat / Coastline / 1875</p></article>
+  </section>
+</main>
+HTML);
+});
diff --git a/tests/Unit/Performance/ProfileReportTest.php b/tests/Unit/Performance/ProfileReportTest.php
new file mode 100644
index 0000000..13f90e9
--- /dev/null
+++ b/tests/Unit/Performance/ProfileReportTest.php
@@ -0,0 +1,43 @@
+<?php
+
+use Keepsuit\Liquid\Performance\ProfileReport;
+use Keepsuit\Liquid\Profiler\Profile;
+use Keepsuit\Liquid\Profiler\Profiler;
+use Keepsuit\Liquid\Profiler\ProfileType;
+
+test('it exports the profiler tree with self duration', function () {
+    $profiler = new Profiler;
+
+    $profiler->enter(new Profile(ProfileType::Template, 'collection'));
+    $profiler->enter(new Profile(ProfileType::Variable, 'product.title'));
+    $profiler->leave();
+    $profiler->leave();
+
+    $report = ProfileReport::fromProfiler($profiler);
+    /** @var array<string, mixed> $rootProfile */
+    $rootProfile = $report['profiles'][0];
+    /** @var list<array<string, mixed>> $children */
+    $children = $rootProfile['children'];
+
+    expect($report)
+        ->toHaveKeys(['schema_version', 'generated_at', 'php_version', 'profiles'])
+        ->and($report['schema_version'])->toBe(1)
+        ->and($report['profiles'])->toHaveCount(1)
+        ->and($rootProfile)
+        ->toMatchArray([
+            'type' => 'template',
+            'name' => 'collection',
+        ])
+        ->and($children)
+        ->toHaveCount(1)
+        ->and($children[0])
+        ->toMatchArray([
+            'type' => 'variable',
+            'name' => 'product.title',
+            'children' => [],
+        ])
+        ->and($rootProfile['duration'])->toBeGreaterThanOrEqual(0)
+        ->and($rootProfile['self_duration'])->toBeGreaterThanOrEqual(0)
+        ->and($rootProfile['memory_usage'])->toBeInt()
+        ->and($rootProfile['peak_memory_usage'])->toBeInt();
+});
diff --git a/tools/phpbench-compare.php b/tools/phpbench-compare.php
index 9cd18d1..e9cc29f 100644
--- a/tools/phpbench-compare.php
+++ b/tools/phpbench-compare.php
@@ -17,8 +17,8 @@
 sort($sharedNames);
 
 if ($sharedNames === []) {
-    fwrite(STDERR, "No common benchmark names found between base and PR results.\n");
-    exit(2);
+    echo "> No comparable benchmark rows: the PR benchmark suite has changed. Establish a matching baseline on `main` before drawing performance conclusions.\n";
+    exit(0);
 }
 
 // Runner jitter is routinely ±2%, so a single median over every benchmark is

From 71581538229bfefe0a395c3b6204cb0363ef7d51 Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 10:59:01 +0200
Subject: [PATCH 03/11] Use file-backed complex benchmark theme

---
 composer.json                                 |   4 +-
 .../Support/ComplexThemeFixture.php           | 109 ++++++++++++------
 performance/benchmarks/TemplateCacheBench.php |  12 +-
 performance/benchmarks/ThemeBench.php         |  15 ++-
 performance/profile-theme.php                 |   5 +-
 .../complex-collection/collection_grid.liquid |   3 +
 .../collection_header.liquid                  |   6 +
 .../collection_navigation.liquid              |   5 +
 .../complex-collection/collection_page.liquid |   1 +
 .../complex-collection/page_shell.liquid      |   5 +
 .../complex-collection/product_card.liquid    |   9 ++
 .../complex-collection/product_media.liquid   |   4 +
 .../product_metadata.liquid                   |   8 ++
 .../complex-collection/product_pricing.liquid |   5 +
 phpbench.json                                 |   1 +
 .../Performance/ComplexThemeFixtureTest.php   |  21 ++--
 16 files changed, 141 insertions(+), 72 deletions(-)
 create mode 100644 performance/themes/complex-collection/collection_grid.liquid
 create mode 100644 performance/themes/complex-collection/collection_header.liquid
 create mode 100644 performance/themes/complex-collection/collection_navigation.liquid
 create mode 100644 performance/themes/complex-collection/collection_page.liquid
 create mode 100644 performance/themes/complex-collection/page_shell.liquid
 create mode 100644 performance/themes/complex-collection/product_card.liquid
 create mode 100644 performance/themes/complex-collection/product_media.liquid
 create mode 100644 performance/themes/complex-collection/product_metadata.liquid
 create mode 100644 performance/themes/complex-collection/product_pricing.liquid

diff --git a/composer.json b/composer.json
index 2bb7f99..d9ac60f 100644
--- a/composer.json
+++ b/composer.json
@@ -51,8 +51,8 @@
             "pint",
             "phpstan analyse"
         ],
-        "benchmark": "phpbench run --group=macro --report=aggregate",
-        "benchmark:micro": "phpbench run --group=micro --report=aggregate",
+        "benchmark": "phpbench run --group=macro --retry-threshold=5 --report=aggregate",
+        "benchmark:micro": "phpbench run --group=micro --retry-threshold=5 --report=aggregate",
         "profile": "phpbench xdebug:profile"
     },
     "config": {
diff --git a/performance/benchmarks/Support/ComplexThemeFixture.php b/performance/benchmarks/Support/ComplexThemeFixture.php
index ade0a3b..180fd80 100644
--- a/performance/benchmarks/Support/ComplexThemeFixture.php
+++ b/performance/benchmarks/Support/ComplexThemeFixture.php
@@ -3,22 +3,49 @@
 namespace Keepsuit\Liquid\Performance\benchmarks\Support;
 
 use Keepsuit\Liquid\Attributes\Cache;
-use Keepsuit\Liquid\Contracts\LiquidFileSystem;
 use Keepsuit\Liquid\Contracts\LiquidTemplatesCache;
 use Keepsuit\Liquid\Drop;
 use Keepsuit\Liquid\Environment;
 use Keepsuit\Liquid\EnvironmentFactory;
+use Keepsuit\Liquid\FileSystems\LocalFileSystem;
 use Keepsuit\Liquid\Filters\FiltersProvider;
 use Keepsuit\Liquid\Render\RenderContext;
 
 final class ComplexThemeFixture
 {
-    public const ROOT_TEMPLATE_NAME = 'collection-page';
+    public const ROOT_TEMPLATE_NAME = 'collection_page';
+
+    private const PRODUCTS = [
+        ['linen-shirt', 'Linen Shirt', 'ACME Apparel', 3950, 5900, ['new', 'linen']],
+        ['canvas-tote', 'Canvas Tote', 'Field Goods', 2400, 3200, ['travel', 'sale']],
+        ['sun-hat', 'Sun Hat', 'Coastline', 1875, 2500, ['summer', 'sale']],
+        ['ceramic-mug', 'Ceramic Mug', 'Studio Form', 2200, 2200, ['kitchen', 'new']],
+        ['weekend-bag', 'Weekend Bag', 'Field Goods', 8900, 10900, ['travel', 'limited']],
+        ['cotton-throw', 'Cotton Throw', 'North Loom', 7600, 7600, ['home', 'soft']],
+        ['leather-wallet', 'Leather Wallet', 'Atelier No. 8', 5200, 6500, ['gift', 'sale']],
+        ['travel-bottle', 'Travel Bottle', 'Coastline', 2800, 2800, ['travel', 'summer']],
+        ['desk-lamp', 'Desk Lamp', 'Studio Form', 6800, 8100, ['home', 'new']],
+        ['wool-socks', 'Wool Socks', 'North Loom', 1600, 1600, ['warm', 'gift']],
+        ['market-basket', 'Market Basket', 'Field Goods', 4300, 5000, ['home', 'limited']],
+        ['notebook-set', 'Notebook Set', 'Paper Mill', 1900, 1900, ['desk', 'new']],
+        ['silk-scarf', 'Silk Scarf', 'Atelier No. 8', 7400, 8900, ['gift', 'sale']],
+        ['beach-towel', 'Beach Towel', 'Coastline', 3600, 3600, ['summer', 'travel']],
+        ['glass-vase', 'Glass Vase', 'Studio Form', 4600, 5200, ['home', 'limited']],
+        ['knit-cap', 'Knit Cap', 'North Loom', 3100, 3100, ['warm', 'new']],
+        ['key-organizer', 'Key Organizer', 'Atelier No. 8', 4100, 4800, ['gift', 'travel']],
+        ['picnic-blanket', 'Picnic Blanket', 'Field Goods', 9200, 11200, ['summer', 'home']],
+        ['tea-canister', 'Tea Canister', 'Paper Mill', 2700, 2700, ['kitchen', 'desk']],
+        ['camp-lantern', 'Camp Lantern', 'Coastline', 5400, 6200, ['travel', 'limited']],
+        ['table-clock', 'Table Clock', 'Studio Form', 5700, 5700, ['home', 'desk']],
+        ['cashmere-wrap', 'Cashmere Wrap', 'North Loom', 12800, 14900, ['warm', 'gift']],
+        ['card-holder', 'Card Holder', 'Atelier No. 8', 3300, 3300, ['gift', 'new']],
+        ['sketchbook', 'Sketchbook', 'Paper Mill', 2500, 2500, ['desk', 'travel']],
+    ];
 
     public static function environment(?LiquidTemplatesCache $templatesCache = null): Environment
     {
         $factory = EnvironmentFactory::new()
-            ->setFilesystem(new ComplexThemeFileSystem(self::templateSources()))
+            ->setFilesystem(new LocalFileSystem(self::themePath()))
             ->registerFilters(ComplexThemeFilters::class);
 
         if ($templatesCache !== null) {
@@ -28,29 +55,45 @@ public static function environment(?LiquidTemplatesCache $templatesCache = null)
         return $factory->build();
     }
 
-    public static function rootTemplateName(): string
+    public static function themePath(): string
     {
-        return self::ROOT_TEMPLATE_NAME;
+        return dirname(__DIR__, 2).'/themes/complex-collection';
     }
 
-    public static function rootTemplateSource(): string
+    public static function rootTemplateName(): string
     {
-        return self::templateSources()[self::ROOT_TEMPLATE_NAME];
+        return self::ROOT_TEMPLATE_NAME;
     }
 
     /**
-     * @return array<string, string>
+     * @return list<string>
      */
-    public static function templateSources(): array
+    public static function templateNames(): array
     {
         return [
-            self::ROOT_TEMPLATE_NAME => '{% render "page-shell", collection: collection %}',
-            'page-shell' => "<main data-collection=\"{{ collection.handle }}\">\n  {% render \"collection-section\", collection: collection %}\n</main>",
-            'collection-section' => "<header><h1>{{ collection.title }}</h1><p>{{ collection.products | size }} products</p></header>\n  <section class=\"products\">\n{% for product in collection.products %}    {% render \"product-card\", product: product, label: collection.label %}\n{% endfor %}  </section>",
-            'product-card' => '<article data-handle="{{ product.handle }}"><h2>{{ product.title }}</h2><p class="vendor">{{ product.vendor | upcase }}</p><p class="price">{{ product.price_cents | fixture_money }}</p><p class="label">{{ label }}</p><p class="summary">{{ product.title }} / {{ product.vendor }} / {{ product.inventory_label }} | {{ product.title }} / {{ product.vendor }} / {{ product.inventory_label }}</p></article>',
+            'collection_page',
+            'page_shell',
+            'collection_header',
+            'collection_navigation',
+            'collection_grid',
+            'product_card',
+            'product_media',
+            'product_pricing',
+            'product_metadata',
         ];
     }
 
+    public static function templateSource(string $templateName): string
+    {
+        $source = file_get_contents(self::themePath().'/'.$templateName.'.liquid');
+
+        if ($source === false) {
+            throw new \RuntimeException("Could not read fixture template [$templateName].");
+        }
+
+        return $source;
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -61,11 +104,12 @@ public static function renderData(): array
                 'handle' => 'summer-essentials',
                 'title' => 'Summer Essentials',
                 'label' => 'summer',
-                'products' => [
-                    new ComplexThemeProduct('linen-shirt', 'Linen Shirt', 'ACME Apparel', 3950),
-                    new ComplexThemeProduct('canvas-tote', 'Canvas Tote', 'Field Goods', 2400),
-                    new ComplexThemeProduct('sun-hat', 'Sun Hat', 'Coastline', 1875),
-                ],
+                'description' => 'Everyday pieces for long weekends, slow mornings, and bright afternoons.',
+                'tags' => ['New arrivals', 'Travel ready', 'Summer layers', 'Gifts under €100'],
+                'products' => array_map(
+                    static fn (array $product) => new ComplexThemeProduct(...$product),
+                    self::PRODUCTS,
+                ),
             ],
         ];
     }
@@ -76,21 +120,6 @@ public static function newRenderContext(Environment $environment): RenderContext
     }
 }
 
-final class ComplexThemeFileSystem implements LiquidFileSystem
-{
-    /**
-     * @param  array<string, string>  $templates
-     */
-    public function __construct(
-        private readonly array $templates,
-    ) {}
-
-    public function readTemplateFile(string $templateName): string
-    {
-        return $this->templates[$templateName] ?? throw new \RuntimeException("Unknown fixture template [$templateName].");
-    }
-}
-
 final class ComplexThemeFilters extends FiltersProvider
 {
     public function fixtureMoney(int|float $cents): string
@@ -101,11 +130,16 @@ public function fixtureMoney(int|float $cents): string
 
 final class ComplexThemeProduct extends Drop
 {
+    /**
+     * @param  list<string>  $badges
+     */
     public function __construct(
         public readonly string $handle,
         public readonly string $title,
         private readonly string $vendorName,
         private readonly int $priceCents,
+        private readonly int $compareAtPriceCents,
+        public readonly array $badges,
     ) {}
 
     public function vendor(): string
@@ -118,9 +152,14 @@ public function priceCents(): int
         return $this->priceCents;
     }
 
+    public function compareAtPriceCents(): int
+    {
+        return $this->compareAtPriceCents;
+    }
+
     #[Cache]
-    public function inventoryLabel(): int
+    public function inventoryLabel(): string
     {
-        return $this->priceCents;
+        return $this->priceCents < 3000 ? 'Low stock' : 'In stock';
     }
 }
diff --git a/performance/benchmarks/TemplateCacheBench.php b/performance/benchmarks/TemplateCacheBench.php
index a58330d..48f6dfe 100644
--- a/performance/benchmarks/TemplateCacheBench.php
+++ b/performance/benchmarks/TemplateCacheBench.php
@@ -17,8 +17,8 @@
 use PhpBench\Attributes\Revs;
 
 #[Groups(['macro'])]
-#[Iterations(20)]
-#[Revs(100)]
+#[Iterations(10)]
+#[Revs(20)]
 #[OutputMode('throughput')]
 #[OutputTimeUnit('seconds', precision: 3)]
 #[AfterMethods('clearCache')]
@@ -31,42 +31,36 @@ class TemplateCacheBench
     private LiquidTemplatesCache $cache;
 
     #[BeforeMethods('setUpInMemoryBuild')]
-    #[Revs(1000)]
     public function benchBuildInMemory(): void
     {
         $this->buildStaticTheme();
     }
 
     #[BeforeMethods('setUpInMemoryCachedRender')]
-    #[Revs(1000)]
     public function benchLoadAndRenderInMemory(): void
     {
         $this->renderCachedTheme();
     }
 
     #[BeforeMethods('setUpSerializeBuild')]
-    #[Revs(500)]
     public function benchBuildSerialize(): void
     {
         $this->buildStaticTheme();
     }
 
     #[BeforeMethods('setUpSerializeCachedRender')]
-    #[Revs(1000)]
     public function benchLoadAndRenderSerialize(): void
     {
         $this->renderCachedTheme();
     }
 
     #[BeforeMethods('setUpVarExporterBuild')]
-    #[Revs(1000)]
     public function benchBuildVarExporter(): void
     {
         $this->buildStaticTheme();
     }
 
     #[BeforeMethods('setUpVarExporterCachedRender')]
-    #[Revs(1000)]
     public function benchLoadAndRenderVarExporter(): void
     {
         $this->renderCachedTheme();
@@ -127,7 +121,7 @@ private function setUpCachedRender(string $backend): void
 
     private function compileStaticTheme(Environment $environment): void
     {
-        foreach (array_keys(ComplexThemeFixture::templateSources()) as $templateName) {
+        foreach (ComplexThemeFixture::templateNames() as $templateName) {
             $environment->parseTemplate($templateName);
         }
     }
diff --git a/performance/benchmarks/ThemeBench.php b/performance/benchmarks/ThemeBench.php
index e6811d1..1ded8cb 100644
--- a/performance/benchmarks/ThemeBench.php
+++ b/performance/benchmarks/ThemeBench.php
@@ -13,8 +13,8 @@
 use PhpBench\Attributes\Revs;
 
 #[Groups(['macro'])]
-#[Iterations(20)]
-#[Revs(1000)]
+#[Iterations(10)]
+#[Revs(20)]
 #[OutputMode('throughput')]
 #[OutputTimeUnit('seconds', precision: 3)]
 #[BeforeMethods('setUp')]
@@ -28,7 +28,7 @@ public function setUp(): void
     {
         $this->environment = ComplexThemeFixture::environment();
 
-        foreach (array_keys(ComplexThemeFixture::templateSources()) as $name) {
+        foreach (ComplexThemeFixture::templateNames() as $name) {
             $this->environment->parseTemplate($name);
         }
 
@@ -37,15 +37,15 @@ public function setUp(): void
 
     public function benchTokenize(): void
     {
-        foreach (ComplexThemeFixture::templateSources() as $source) {
-            $this->environment->newParseContext()->tokenize($source);
+        foreach (ComplexThemeFixture::templateNames() as $name) {
+            $this->environment->newParseContext()->tokenize(ComplexThemeFixture::templateSource($name));
         }
     }
 
     public function benchParse(): void
     {
-        foreach (ComplexThemeFixture::templateSources() as $name => $source) {
-            $this->environment->parseString($source, $name);
+        foreach (ComplexThemeFixture::templateNames() as $name) {
+            $this->environment->parseString(ComplexThemeFixture::templateSource($name), $name);
         }
     }
 
@@ -54,7 +54,6 @@ public function benchRender(): void
         $this->template->render(ComplexThemeFixture::newRenderContext($this->environment));
     }
 
-    #[Revs(1500)]
     public function benchStream(): void
     {
         foreach ($this->template->stream(ComplexThemeFixture::newRenderContext($this->environment)) as $chunk) {
diff --git a/performance/profile-theme.php b/performance/profile-theme.php
index c3125de..bb8a2c8 100644
--- a/performance/profile-theme.php
+++ b/performance/profile-theme.php
@@ -40,10 +40,7 @@
     variables: true,
 ));
 
-$template = $environment->parseString(
-    source: ComplexThemeFixture::rootTemplateSource(),
-    name: ComplexThemeFixture::rootTemplateName(),
-);
+$template = $environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
 $template->render(ComplexThemeFixture::newRenderContext($environment));
 
 $report = ProfileReport::fromProfiler($profiler);
diff --git a/performance/themes/complex-collection/collection_grid.liquid b/performance/themes/complex-collection/collection_grid.liquid
new file mode 100644
index 0000000..eef4ce2
--- /dev/null
+++ b/performance/themes/complex-collection/collection_grid.liquid
@@ -0,0 +1,3 @@
+<section class="products" data-count="{{ collection.products | size }}">
+{% for product in collection.products %}  {% render "product_card", product: product, label: collection.label, position: forloop.index %}
+{% endfor %}</section>
diff --git a/performance/themes/complex-collection/collection_header.liquid b/performance/themes/complex-collection/collection_header.liquid
new file mode 100644
index 0000000..e521680
--- /dev/null
+++ b/performance/themes/complex-collection/collection_header.liquid
@@ -0,0 +1,6 @@
+<header class="collection-header">
+  <p class="eyebrow">{{ collection.label | upcase | append: " collection" }}</p>
+  <h1>{{ collection.title }}</h1>
+  <p>{{ collection.description }}</p>
+  <p class="count">{{ collection.products | size }} products selected</p>
+</header>
diff --git a/performance/themes/complex-collection/collection_navigation.liquid b/performance/themes/complex-collection/collection_navigation.liquid
new file mode 100644
index 0000000..4d7b3e5
--- /dev/null
+++ b/performance/themes/complex-collection/collection_navigation.liquid
@@ -0,0 +1,5 @@
+<nav aria-label="Collection filters" class="collection-navigation">
+  <ul>
+{% for tag in collection.tags %}    <li data-position="{{ forloop.index }}">{{ tag | replace: " ", "-" | upcase }}</li>
+{% endfor %}  </ul>
+</nav>
diff --git a/performance/themes/complex-collection/collection_page.liquid b/performance/themes/complex-collection/collection_page.liquid
new file mode 100644
index 0000000..7d509e2
--- /dev/null
+++ b/performance/themes/complex-collection/collection_page.liquid
@@ -0,0 +1 @@
+{% render "page_shell", collection: collection %}
diff --git a/performance/themes/complex-collection/page_shell.liquid b/performance/themes/complex-collection/page_shell.liquid
new file mode 100644
index 0000000..e0b817b
--- /dev/null
+++ b/performance/themes/complex-collection/page_shell.liquid
@@ -0,0 +1,5 @@
+<main data-collection="{{ collection.handle }}" class="collection-page">
+  {% render "collection_header", collection: collection %}
+  {% render "collection_navigation", collection: collection %}
+  {% render "collection_grid", collection: collection %}
+</main>
diff --git a/performance/themes/complex-collection/product_card.liquid b/performance/themes/complex-collection/product_card.liquid
new file mode 100644
index 0000000..9a56c60
--- /dev/null
+++ b/performance/themes/complex-collection/product_card.liquid
@@ -0,0 +1,9 @@
+<article data-handle="{{ product.handle }}" data-position="{{ position }}" class="product-card">
+  {% render "product_media", product: product %}
+  <div class="product-card__details">
+    <p class="product-card__vendor">{{ product.vendor | upcase }}</p>
+    <h2>{{ product.title }}</h2>
+    {% render "product_pricing", product: product %}
+    {% render "product_metadata", product: product, label: label %}
+  </div>
+</article>
diff --git a/performance/themes/complex-collection/product_media.liquid b/performance/themes/complex-collection/product_media.liquid
new file mode 100644
index 0000000..3a073a6
--- /dev/null
+++ b/performance/themes/complex-collection/product_media.liquid
@@ -0,0 +1,4 @@
+<figure class="product-card__media" data-image="{{ product.handle | append: "-image" }}">
+  <img alt="{{ product.title | escape }}" src="/images/{{ product.handle }}.jpg">
+  <figcaption>{{ product.title }} by {{ product.vendor }}</figcaption>
+</figure>
diff --git a/performance/themes/complex-collection/product_metadata.liquid b/performance/themes/complex-collection/product_metadata.liquid
new file mode 100644
index 0000000..c7d125d
--- /dev/null
+++ b/performance/themes/complex-collection/product_metadata.liquid
@@ -0,0 +1,8 @@
+<div class="product-card__metadata">
+  <p class="label">{{ label }}</p>
+  <p class="inventory">{{ product.inventory_label }} / {{ product.inventory_label }}</p>
+  <ul class="badges">
+{% for badge in product.badges %}    <li>{{ badge | upcase }}</li>
+{% endfor %}  </ul>
+  <p class="summary">{{ product.title }} / {{ product.vendor }} / {{ product.inventory_label }} | {{ product.title }} / {{ product.vendor }} / {{ product.inventory_label }}</p>
+</div>
diff --git a/performance/themes/complex-collection/product_pricing.liquid b/performance/themes/complex-collection/product_pricing.liquid
new file mode 100644
index 0000000..47219fe
--- /dev/null
+++ b/performance/themes/complex-collection/product_pricing.liquid
@@ -0,0 +1,5 @@
+<p class="product-card__pricing">
+  <span class="price">{{ product.price_cents | fixture_money }}</span>
+  {% if product.compare_at_price_cents > product.price_cents %}<s>{{ product.compare_at_price_cents | fixture_money }}</s>{% endif %}
+  <span class="saving">{{ product.compare_at_price_cents | minus: product.price_cents | fixture_money }}</span>
+</p>
diff --git a/phpbench.json b/phpbench.json
index 753df5e..78c320c 100644
--- a/phpbench.json
+++ b/phpbench.json
@@ -2,6 +2,7 @@
     "$schema": "./vendor/phpbench/phpbench/phpbench.schema.json",
     "runner.bootstrap": "vendor/autoload.php",
     "runner.path": "performance/benchmarks",
+    "runner.retry_threshold": 5,
     "runner.php_config": {
         "opcache.enable": 1,
         "opcache.enable_cli": 1,
diff --git a/tests/Integration/Performance/ComplexThemeFixtureTest.php b/tests/Integration/Performance/ComplexThemeFixtureTest.php
index 8829b2c..83d542c 100644
--- a/tests/Integration/Performance/ComplexThemeFixtureTest.php
+++ b/tests/Integration/Performance/ComplexThemeFixtureTest.php
@@ -5,19 +5,12 @@
 test('complex theme fixture renders the deterministic collection page', function () {
     $environment = ComplexThemeFixture::environment();
 
-    $template = $environment->parseString(
-        ComplexThemeFixture::rootTemplateSource(),
-        ComplexThemeFixture::rootTemplateName(),
-    );
+    $template = $environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
 
-    expect($template->render(ComplexThemeFixture::newRenderContext($environment)))->toBe(<<<'HTML'
-<main data-collection="summer-essentials">
-  <header><h1>Summer Essentials</h1><p>3 products</p></header>
-  <section class="products">
-    <article data-handle="linen-shirt"><h2>Linen Shirt</h2><p class="vendor">ACME APPAREL</p><p class="price">€39.50</p><p class="label">summer</p><p class="summary">Linen Shirt / ACME Apparel / 3950 | Linen Shirt / ACME Apparel / 3950</p></article>
-    <article data-handle="canvas-tote"><h2>Canvas Tote</h2><p class="vendor">FIELD GOODS</p><p class="price">€24.00</p><p class="label">summer</p><p class="summary">Canvas Tote / Field Goods / 2400 | Canvas Tote / Field Goods / 2400</p></article>
-    <article data-handle="sun-hat"><h2>Sun Hat</h2><p class="vendor">COASTLINE</p><p class="price">€18.75</p><p class="label">summer</p><p class="summary">Sun Hat / Coastline / 1875 | Sun Hat / Coastline / 1875</p></article>
-  </section>
-</main>
-HTML);
+    $rendered = $template->render(ComplexThemeFixture::newRenderContext($environment));
+
+    expect($rendered)
+        ->toContain('24 products selected')
+        ->toContain('data-handle="sketchbook"')
+        ->and(hash('sha256', $rendered))->toBe('17ee8672cb258106bb58a0642a4fa55cabc66163f0b27cdb37c9f3392fb80a45');
 });

From b43b5202a1bf050a53c96992e89167e9e6d90186 Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 11:15:45 +0200
Subject: [PATCH 04/11] Use Shopify-style benchmark theme layout

---
 .../Support/ComplexThemeFixture.php           | 42 +++++++++++++++++--
 performance/benchmarks/ThemeBench.php         | 15 +++++--
 performance/profile-theme.php                 |  6 ++-
 .../{page_shell.liquid => collection.liquid}  |  5 +++
 .../complex-collection/collection_page.liquid |  1 -
 .../themes/complex-collection/theme.liquid    | 33 +++++++++++++++
 .../Performance/ComplexThemeFixtureTest.php   | 16 +++++--
 7 files changed, 105 insertions(+), 13 deletions(-)
 rename performance/themes/complex-collection/{page_shell.liquid => collection.liquid} (58%)
 delete mode 100644 performance/themes/complex-collection/collection_page.liquid
 create mode 100644 performance/themes/complex-collection/theme.liquid

diff --git a/performance/benchmarks/Support/ComplexThemeFixture.php b/performance/benchmarks/Support/ComplexThemeFixture.php
index 180fd80..c8b0624 100644
--- a/performance/benchmarks/Support/ComplexThemeFixture.php
+++ b/performance/benchmarks/Support/ComplexThemeFixture.php
@@ -13,7 +13,9 @@
 
 final class ComplexThemeFixture
 {
-    public const ROOT_TEMPLATE_NAME = 'collection_page';
+    public const ROOT_TEMPLATE_NAME = 'collection';
+
+    public const LAYOUT_TEMPLATE_NAME = 'theme';
 
     private const PRODUCTS = [
         ['linen-shirt', 'Linen Shirt', 'ACME Apparel', 3950, 5900, ['new', 'linen']],
@@ -71,8 +73,8 @@ public static function rootTemplateName(): string
     public static function templateNames(): array
     {
         return [
-            'collection_page',
-            'page_shell',
+            self::ROOT_TEMPLATE_NAME,
+            self::LAYOUT_TEMPLATE_NAME,
             'collection_header',
             'collection_navigation',
             'collection_grid',
@@ -100,6 +102,32 @@ public static function templateSource(string $templateName): string
     public static function renderData(): array
     {
         return [
+            'shop' => [
+                'name' => 'Northstar Goods',
+                'currency' => 'EUR',
+            ],
+            'cart' => [
+                'item_count' => 3,
+                'total_price' => 12650,
+            ],
+            'linklists' => [
+                'main-menu' => [
+                    'links' => [
+                        ['url' => '/collections/summer-essentials', 'title' => 'Summer'],
+                        ['url' => '/collections/travel', 'title' => 'Travel'],
+                        ['url' => '/collections/home', 'title' => 'Home'],
+                    ],
+                ],
+                'footer' => [
+                    'links' => [
+                        ['url' => '/pages/shipping', 'title' => 'Shipping'],
+                        ['url' => '/pages/returns', 'title' => 'Returns'],
+                        ['url' => '/pages/contact', 'title' => 'Contact'],
+                    ],
+                ],
+            ],
+            'page_title' => 'Summer Essentials',
+            'template' => 'collection',
             'collection' => [
                 'handle' => 'summer-essentials',
                 'title' => 'Summer Essentials',
@@ -118,6 +146,14 @@ public static function newRenderContext(Environment $environment): RenderContext
     {
         return $environment->newRenderContext(staticData: self::renderData());
     }
+
+    public static function newLayoutRenderContext(Environment $environment, mixed $content): RenderContext
+    {
+        return $environment->newRenderContext(staticData: [
+            ...self::renderData(),
+            'content_for_layout' => $content,
+        ]);
+    }
 }
 
 final class ComplexThemeFilters extends FiltersProvider
diff --git a/performance/benchmarks/ThemeBench.php b/performance/benchmarks/ThemeBench.php
index 1ded8cb..4802ab6 100644
--- a/performance/benchmarks/ThemeBench.php
+++ b/performance/benchmarks/ThemeBench.php
@@ -22,7 +22,9 @@ class ThemeBench
 {
     private Environment $environment;
 
-    private Template $template;
+    private Template $page;
+
+    private Template $layout;
 
     public function setUp(): void
     {
@@ -32,7 +34,8 @@ public function setUp(): void
             $this->environment->parseTemplate($name);
         }
 
-        $this->template = $this->environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
+        $this->page = $this->environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
+        $this->layout = $this->environment->parseTemplate(ComplexThemeFixture::LAYOUT_TEMPLATE_NAME);
     }
 
     public function benchTokenize(): void
@@ -51,12 +54,16 @@ public function benchParse(): void
 
     public function benchRender(): void
     {
-        $this->template->render(ComplexThemeFixture::newRenderContext($this->environment));
+        $content = $this->page->render(ComplexThemeFixture::newRenderContext($this->environment));
+
+        $this->layout->render(ComplexThemeFixture::newLayoutRenderContext($this->environment, $content));
     }
 
     public function benchStream(): void
     {
-        foreach ($this->template->stream(ComplexThemeFixture::newRenderContext($this->environment)) as $chunk) {
+        $content = $this->page->stream(ComplexThemeFixture::newRenderContext($this->environment));
+
+        foreach ($this->layout->stream(ComplexThemeFixture::newLayoutRenderContext($this->environment, $content)) as $chunk) {
         }
     }
 }
diff --git a/performance/profile-theme.php b/performance/profile-theme.php
index bb8a2c8..c14eef3 100644
--- a/performance/profile-theme.php
+++ b/performance/profile-theme.php
@@ -40,8 +40,10 @@
     variables: true,
 ));
 
-$template = $environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
-$template->render(ComplexThemeFixture::newRenderContext($environment));
+$page = $environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
+$layout = $environment->parseTemplate(ComplexThemeFixture::LAYOUT_TEMPLATE_NAME);
+$content = $page->render(ComplexThemeFixture::newRenderContext($environment));
+$layout->render(ComplexThemeFixture::newLayoutRenderContext($environment, $content));
 
 $report = ProfileReport::fromProfiler($profiler);
 $json = json_encode($report, JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR).PHP_EOL;
diff --git a/performance/themes/complex-collection/page_shell.liquid b/performance/themes/complex-collection/collection.liquid
similarity index 58%
rename from performance/themes/complex-collection/page_shell.liquid
rename to performance/themes/complex-collection/collection.liquid
index e0b817b..fc67740 100644
--- a/performance/themes/complex-collection/page_shell.liquid
+++ b/performance/themes/complex-collection/collection.liquid
@@ -1,5 +1,10 @@
+{% assign product_count = collection.products | size %}
+{% if product_count > 0 %}
 <main data-collection="{{ collection.handle }}" class="collection-page">
   {% render "collection_header", collection: collection %}
   {% render "collection_navigation", collection: collection %}
   {% render "collection_grid", collection: collection %}
 </main>
+{% else %}
+<p class="collection-page__empty">No products found in this collection.</p>
+{% endif %}
diff --git a/performance/themes/complex-collection/collection_page.liquid b/performance/themes/complex-collection/collection_page.liquid
deleted file mode 100644
index 7d509e2..0000000
--- a/performance/themes/complex-collection/collection_page.liquid
+++ /dev/null
@@ -1 +0,0 @@
-{% render "page_shell", collection: collection %}
diff --git a/performance/themes/complex-collection/theme.liquid b/performance/themes/complex-collection/theme.liquid
new file mode 100644
index 0000000..a988084
--- /dev/null
+++ b/performance/themes/complex-collection/theme.liquid
@@ -0,0 +1,33 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <title>{{ shop.name }} &mdash; {{ page_title }}</title>
+  <meta charset="utf-8">
+</head>
+<body id="page-{{ template }}">
+  <header class="site-header">
+    <a href="/" class="site-header__brand">{{ shop.name }}</a>
+    <nav aria-label="Main navigation">
+      <ul>{% for link in linklists.main-menu.links %}
+        <li><a href="{{ link.url }}">{{ link.title }}</a></li>{% endfor %}
+      </ul>
+    </nav>
+    <p class="site-header__cart">Cart: {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} / {{ cart.total_price | fixture_money }}</p>
+  </header>
+  <div class="site-layout">
+    <aside class="site-layout__sidebar">
+      <h2>{{ collection.title }} tags</h2>
+      <ul>{% for tag in collection.tags %}
+        <li>{{ tag | replace: ' ', '-' | upcase }}</li>{% endfor %}
+      </ul>
+    </aside>
+    {{ content_for_layout }}
+  </div>
+  <footer class="site-footer">
+    <p>All prices are in {{ shop.currency }}.</p>
+    <nav aria-label="Footer navigation">{% for link in linklists.footer.links %}
+      <a href="{{ link.url }}">{{ link.title }}</a>{% unless forloop.last %} / {% endunless %}{% endfor %}
+    </nav>
+  </footer>
+</body>
+</html>
diff --git a/tests/Integration/Performance/ComplexThemeFixtureTest.php b/tests/Integration/Performance/ComplexThemeFixtureTest.php
index 83d542c..4135141 100644
--- a/tests/Integration/Performance/ComplexThemeFixtureTest.php
+++ b/tests/Integration/Performance/ComplexThemeFixtureTest.php
@@ -5,12 +5,22 @@
 test('complex theme fixture renders the deterministic collection page', function () {
     $environment = ComplexThemeFixture::environment();
 
-    $template = $environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
+    $page = $environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
+    $layout = $environment->parseTemplate(ComplexThemeFixture::LAYOUT_TEMPLATE_NAME);
 
-    $rendered = $template->render(ComplexThemeFixture::newRenderContext($environment));
+    $content = $page->render(ComplexThemeFixture::newRenderContext($environment));
+    $rendered = $layout->render(ComplexThemeFixture::newLayoutRenderContext($environment, $content));
+
+    $streamedContent = $page->stream(ComplexThemeFixture::newRenderContext($environment));
+    $streamed = implode('', iterator_to_array(
+        $layout->stream(ComplexThemeFixture::newLayoutRenderContext($environment, $streamedContent)),
+        false,
+    ));
 
     expect($rendered)
+        ->toContain('<title>Northstar Goods &mdash; Summer Essentials</title>')
         ->toContain('24 products selected')
         ->toContain('data-handle="sketchbook"')
-        ->and(hash('sha256', $rendered))->toBe('17ee8672cb258106bb58a0642a4fa55cabc66163f0b27cdb37c9f3392fb80a45');
+        ->and(hash('sha256', $rendered))->toBe('52a906d56a26957edbf34fc85ed8dc76e3ccb74f9aa012effd5fd84de5e732eb')
+        ->and($streamed)->toBe($rendered);
 });

From 395d84898561c4e6a0eeb480cae9cab0e0cbf087 Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 11:30:00 +0200
Subject: [PATCH 05/11] Structure benchmark theme into pages and snippets

---
 .../Support/ComplexThemeFixture.php           | 124 ++++++++++++++----
 performance/benchmarks/TemplateCacheBench.php |   5 +-
 performance/benchmarks/ThemeBench.php         |  20 +--
 performance/profile-theme.php                 |   7 +-
 .../complex-collection/collection.liquid      |  10 --
 .../complex-collection/collection_grid.liquid |   3 -
 .../collection_navigation.liquid              |   5 -
 .../complex-collection/layout/theme.liquid    |  12 ++
 .../snippets/collection/grid.liquid           |   3 +
 .../collection/header.liquid}                 |   1 +
 .../snippets/collection/navigation.liquid     |   6 +
 .../snippets/index/featured_products.liquid   |   6 +
 .../snippets/index/hero.liquid                |   6 +
 .../snippets/index/journal.liquid             |   6 +
 .../snippets/page/content.liquid              |   4 +
 .../snippets/page/header.liquid               |   4 +
 .../product/card.liquid}                      |   6 +-
 .../snippets/product/detail.liquid            |  10 ++
 .../product/media.liquid}                     |   0
 .../product/metadata.liquid}                  |   0
 .../product/pricing.liquid}                   |   4 +-
 .../snippets/shared/button.liquid             |   1 +
 .../snippets/shared/icon.liquid               |   3 +
 .../snippets/shared/price.liquid              |   1 +
 .../snippets/shared/site_footer.liquid        |   6 +
 .../snippets/shared/site_header.liquid        |   9 ++
 .../templates/collection.liquid               |  10 ++
 .../complex-collection/templates/index.liquid |   5 +
 .../complex-collection/templates/page.liquid  |   4 +
 .../templates/product.liquid                  |   3 +
 .../themes/complex-collection/theme.liquid    |  33 -----
 .../Performance/ComplexThemeFixtureTest.php   |  43 +++---
 32 files changed, 243 insertions(+), 117 deletions(-)
 delete mode 100644 performance/themes/complex-collection/collection.liquid
 delete mode 100644 performance/themes/complex-collection/collection_grid.liquid
 delete mode 100644 performance/themes/complex-collection/collection_navigation.liquid
 create mode 100644 performance/themes/complex-collection/layout/theme.liquid
 create mode 100644 performance/themes/complex-collection/snippets/collection/grid.liquid
 rename performance/themes/complex-collection/{collection_header.liquid => snippets/collection/header.liquid} (66%)
 create mode 100644 performance/themes/complex-collection/snippets/collection/navigation.liquid
 create mode 100644 performance/themes/complex-collection/snippets/index/featured_products.liquid
 create mode 100644 performance/themes/complex-collection/snippets/index/hero.liquid
 create mode 100644 performance/themes/complex-collection/snippets/index/journal.liquid
 create mode 100644 performance/themes/complex-collection/snippets/page/content.liquid
 create mode 100644 performance/themes/complex-collection/snippets/page/header.liquid
 rename performance/themes/complex-collection/{product_card.liquid => snippets/product/card.liquid} (56%)
 create mode 100644 performance/themes/complex-collection/snippets/product/detail.liquid
 rename performance/themes/complex-collection/{product_media.liquid => snippets/product/media.liquid} (100%)
 rename performance/themes/complex-collection/{product_metadata.liquid => snippets/product/metadata.liquid} (100%)
 rename performance/themes/complex-collection/{product_pricing.liquid => snippets/product/pricing.liquid} (57%)
 create mode 100644 performance/themes/complex-collection/snippets/shared/button.liquid
 create mode 100644 performance/themes/complex-collection/snippets/shared/icon.liquid
 create mode 100644 performance/themes/complex-collection/snippets/shared/price.liquid
 create mode 100644 performance/themes/complex-collection/snippets/shared/site_footer.liquid
 create mode 100644 performance/themes/complex-collection/snippets/shared/site_header.liquid
 create mode 100644 performance/themes/complex-collection/templates/collection.liquid
 create mode 100644 performance/themes/complex-collection/templates/index.liquid
 create mode 100644 performance/themes/complex-collection/templates/page.liquid
 create mode 100644 performance/themes/complex-collection/templates/product.liquid
 delete mode 100644 performance/themes/complex-collection/theme.liquid

diff --git a/performance/benchmarks/Support/ComplexThemeFixture.php b/performance/benchmarks/Support/ComplexThemeFixture.php
index c8b0624..0dcceb0 100644
--- a/performance/benchmarks/Support/ComplexThemeFixture.php
+++ b/performance/benchmarks/Support/ComplexThemeFixture.php
@@ -13,9 +13,16 @@
 
 final class ComplexThemeFixture
 {
-    public const ROOT_TEMPLATE_NAME = 'collection';
+    public const ROOT_TEMPLATE_NAME = 'templates.collection';
 
-    public const LAYOUT_TEMPLATE_NAME = 'theme';
+    public const LAYOUT_TEMPLATE_NAME = 'layout.theme';
+
+    private const PAGE_TEMPLATE_NAMES = [
+        'templates.index',
+        self::ROOT_TEMPLATE_NAME,
+        'templates.product',
+        'templates.page',
+    ];
 
     private const PRODUCTS = [
         ['linen-shirt', 'Linen Shirt', 'ACME Apparel', 3950, 5900, ['new', 'linen']],
@@ -73,21 +80,40 @@ public static function rootTemplateName(): string
     public static function templateNames(): array
     {
         return [
-            self::ROOT_TEMPLATE_NAME,
             self::LAYOUT_TEMPLATE_NAME,
-            'collection_header',
-            'collection_navigation',
-            'collection_grid',
-            'product_card',
-            'product_media',
-            'product_pricing',
-            'product_metadata',
+            ...self::PAGE_TEMPLATE_NAMES,
+            'snippets.shared.site_header',
+            'snippets.shared.site_footer',
+            'snippets.shared.button',
+            'snippets.shared.icon',
+            'snippets.shared.price',
+            'snippets.collection.header',
+            'snippets.collection.navigation',
+            'snippets.collection.grid',
+            'snippets.index.hero',
+            'snippets.index.featured_products',
+            'snippets.index.journal',
+            'snippets.product.card',
+            'snippets.product.media',
+            'snippets.product.pricing',
+            'snippets.product.metadata',
+            'snippets.product.detail',
+            'snippets.page.header',
+            'snippets.page.content',
         ];
     }
 
+    /**
+     * @return list<string>
+     */
+    public static function pageTemplateNames(): array
+    {
+        return self::PAGE_TEMPLATE_NAMES;
+    }
+
     public static function templateSource(string $templateName): string
     {
-        $source = file_get_contents(self::themePath().'/'.$templateName.'.liquid');
+        $source = file_get_contents(self::templatePath($templateName));
 
         if ($source === false) {
             throw new \RuntimeException("Could not read fixture template [$templateName].");
@@ -96,11 +122,23 @@ public static function templateSource(string $templateName): string
         return $source;
     }
 
+    public static function templatePath(string $templateName): string
+    {
+        return self::themePath().'/'.str_replace('.', '/', $templateName).'.liquid';
+    }
+
     /**
      * @return array<string, mixed>
      */
-    public static function renderData(): array
+    public static function renderData(string $pageTemplateName = self::ROOT_TEMPLATE_NAME): array
     {
+        $products = array_map(
+            static fn (array $product) => new ComplexThemeProduct(...$product),
+            self::PRODUCTS,
+        );
+
+        $pageType = str_replace('templates.', '', $pageTemplateName);
+
         return [
             'shop' => [
                 'name' => 'Northstar Goods',
@@ -126,34 +164,72 @@ public static function renderData(): array
                     ],
                 ],
             ],
-            'page_title' => 'Summer Essentials',
-            'template' => 'collection',
+            'page_title' => match ($pageType) {
+                'index' => 'New arrivals',
+                'product' => 'Weekend Bag',
+                'page' => 'Our story',
+                default => 'Summer Essentials',
+            },
+            'template' => $pageType,
             'collection' => [
                 'handle' => 'summer-essentials',
                 'title' => 'Summer Essentials',
                 'label' => 'summer',
                 'description' => 'Everyday pieces for long weekends, slow mornings, and bright afternoons.',
                 'tags' => ['New arrivals', 'Travel ready', 'Summer layers', 'Gifts under €100'],
-                'products' => array_map(
-                    static fn (array $product) => new ComplexThemeProduct(...$product),
-                    self::PRODUCTS,
-                ),
+                'products' => $products,
+            ],
+            'product' => $products[4],
+            'page' => [
+                'title' => 'Our story',
+                'content' => 'Northstar Goods makes useful objects for slower days, closer places, and longer weekends.',
+            ],
+            'articles' => [
+                ['title' => 'Packing light for a weekend away', 'excerpt' => 'Three small choices that make travel easier.'],
+                ['title' => 'How to choose a daily carry', 'excerpt' => 'A practical guide to materials and proportions.'],
+                ['title' => 'The objects that earn their place', 'excerpt' => 'On buying less and using more.'],
             ],
         ];
     }
 
-    public static function newRenderContext(Environment $environment): RenderContext
-    {
-        return $environment->newRenderContext(staticData: self::renderData());
+    public static function newRenderContext(
+        Environment $environment,
+        string $pageTemplateName = self::ROOT_TEMPLATE_NAME,
+    ): RenderContext {
+        return $environment->newRenderContext(staticData: self::renderData($pageTemplateName));
     }
 
-    public static function newLayoutRenderContext(Environment $environment, mixed $content): RenderContext
-    {
+    public static function newLayoutRenderContext(
+        Environment $environment,
+        mixed $content,
+        string $pageTemplateName = self::ROOT_TEMPLATE_NAME,
+    ): RenderContext {
         return $environment->newRenderContext(staticData: [
-            ...self::renderData(),
+            ...self::renderData($pageTemplateName),
             'content_for_layout' => $content,
         ]);
     }
+
+    public static function renderPage(Environment $environment, string $pageTemplateName): string
+    {
+        $content = $environment->parseTemplate($pageTemplateName)
+            ->render(self::newRenderContext($environment, $pageTemplateName));
+
+        return $environment->parseTemplate(self::LAYOUT_TEMPLATE_NAME)
+            ->render(self::newLayoutRenderContext($environment, $content, $pageTemplateName));
+    }
+
+    /**
+     * @return \Generator<string>
+     */
+    public static function streamPage(Environment $environment, string $pageTemplateName): \Generator
+    {
+        $content = $environment->parseTemplate($pageTemplateName)
+            ->stream(self::newRenderContext($environment, $pageTemplateName));
+
+        return $environment->parseTemplate(self::LAYOUT_TEMPLATE_NAME)
+            ->stream(self::newLayoutRenderContext($environment, $content, $pageTemplateName));
+    }
 }
 
 final class ComplexThemeFilters extends FiltersProvider
diff --git a/performance/benchmarks/TemplateCacheBench.php b/performance/benchmarks/TemplateCacheBench.php
index 48f6dfe..5c0c479 100644
--- a/performance/benchmarks/TemplateCacheBench.php
+++ b/performance/benchmarks/TemplateCacheBench.php
@@ -134,8 +134,9 @@ private function buildStaticTheme(): void
 
     private function renderCachedTheme(): void
     {
-        $this->environment->parseTemplate(ComplexThemeFixture::rootTemplateName())
-            ->render(ComplexThemeFixture::newRenderContext($this->environment));
+        foreach (ComplexThemeFixture::pageTemplateNames() as $templateName) {
+            ComplexThemeFixture::renderPage($this->environment, $templateName);
+        }
     }
 
     private function newCache(string $backend): LiquidTemplatesCache
diff --git a/performance/benchmarks/ThemeBench.php b/performance/benchmarks/ThemeBench.php
index 4802ab6..b684d9e 100644
--- a/performance/benchmarks/ThemeBench.php
+++ b/performance/benchmarks/ThemeBench.php
@@ -4,7 +4,6 @@
 
 use Keepsuit\Liquid\Environment;
 use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
-use Keepsuit\Liquid\Template;
 use PhpBench\Attributes\BeforeMethods;
 use PhpBench\Attributes\Groups;
 use PhpBench\Attributes\Iterations;
@@ -22,10 +21,6 @@ class ThemeBench
 {
     private Environment $environment;
 
-    private Template $page;
-
-    private Template $layout;
-
     public function setUp(): void
     {
         $this->environment = ComplexThemeFixture::environment();
@@ -33,9 +28,6 @@ public function setUp(): void
         foreach (ComplexThemeFixture::templateNames() as $name) {
             $this->environment->parseTemplate($name);
         }
-
-        $this->page = $this->environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
-        $this->layout = $this->environment->parseTemplate(ComplexThemeFixture::LAYOUT_TEMPLATE_NAME);
     }
 
     public function benchTokenize(): void
@@ -54,16 +46,16 @@ public function benchParse(): void
 
     public function benchRender(): void
     {
-        $content = $this->page->render(ComplexThemeFixture::newRenderContext($this->environment));
-
-        $this->layout->render(ComplexThemeFixture::newLayoutRenderContext($this->environment, $content));
+        foreach (ComplexThemeFixture::pageTemplateNames() as $templateName) {
+            ComplexThemeFixture::renderPage($this->environment, $templateName);
+        }
     }
 
     public function benchStream(): void
     {
-        $content = $this->page->stream(ComplexThemeFixture::newRenderContext($this->environment));
-
-        foreach ($this->layout->stream(ComplexThemeFixture::newLayoutRenderContext($this->environment, $content)) as $chunk) {
+        foreach (ComplexThemeFixture::pageTemplateNames() as $templateName) {
+            foreach (ComplexThemeFixture::streamPage($this->environment, $templateName) as $chunk) {
+            }
         }
     }
 }
diff --git a/performance/profile-theme.php b/performance/profile-theme.php
index c14eef3..f33de4f 100644
--- a/performance/profile-theme.php
+++ b/performance/profile-theme.php
@@ -40,10 +40,9 @@
     variables: true,
 ));
 
-$page = $environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
-$layout = $environment->parseTemplate(ComplexThemeFixture::LAYOUT_TEMPLATE_NAME);
-$content = $page->render(ComplexThemeFixture::newRenderContext($environment));
-$layout->render(ComplexThemeFixture::newLayoutRenderContext($environment, $content));
+foreach (ComplexThemeFixture::pageTemplateNames() as $templateName) {
+    ComplexThemeFixture::renderPage($environment, $templateName);
+}
 
 $report = ProfileReport::fromProfiler($profiler);
 $json = json_encode($report, JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR).PHP_EOL;
diff --git a/performance/themes/complex-collection/collection.liquid b/performance/themes/complex-collection/collection.liquid
deleted file mode 100644
index fc67740..0000000
--- a/performance/themes/complex-collection/collection.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-{% assign product_count = collection.products | size %}
-{% if product_count > 0 %}
-<main data-collection="{{ collection.handle }}" class="collection-page">
-  {% render "collection_header", collection: collection %}
-  {% render "collection_navigation", collection: collection %}
-  {% render "collection_grid", collection: collection %}
-</main>
-{% else %}
-<p class="collection-page__empty">No products found in this collection.</p>
-{% endif %}
diff --git a/performance/themes/complex-collection/collection_grid.liquid b/performance/themes/complex-collection/collection_grid.liquid
deleted file mode 100644
index eef4ce2..0000000
--- a/performance/themes/complex-collection/collection_grid.liquid
+++ /dev/null
@@ -1,3 +0,0 @@
-<section class="products" data-count="{{ collection.products | size }}">
-{% for product in collection.products %}  {% render "product_card", product: product, label: collection.label, position: forloop.index %}
-{% endfor %}</section>
diff --git a/performance/themes/complex-collection/collection_navigation.liquid b/performance/themes/complex-collection/collection_navigation.liquid
deleted file mode 100644
index 4d7b3e5..0000000
--- a/performance/themes/complex-collection/collection_navigation.liquid
+++ /dev/null
@@ -1,5 +0,0 @@
-<nav aria-label="Collection filters" class="collection-navigation">
-  <ul>
-{% for tag in collection.tags %}    <li data-position="{{ forloop.index }}">{{ tag | replace: " ", "-" | upcase }}</li>
-{% endfor %}  </ul>
-</nav>
diff --git a/performance/themes/complex-collection/layout/theme.liquid b/performance/themes/complex-collection/layout/theme.liquid
new file mode 100644
index 0000000..095043a
--- /dev/null
+++ b/performance/themes/complex-collection/layout/theme.liquid
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <title>{{ shop.name }} &mdash; {{ page_title }}</title>
+  <meta charset="utf-8">
+</head>
+<body id="page-{{ template }}">
+  {% render "snippets.shared.site_header", shop: shop, cart: cart, links: linklists.main-menu.links %}
+  {{ content_for_layout }}
+  {% render "snippets.shared.site_footer", shop: shop, links: linklists.footer.links %}
+</body>
+</html>
diff --git a/performance/themes/complex-collection/snippets/collection/grid.liquid b/performance/themes/complex-collection/snippets/collection/grid.liquid
new file mode 100644
index 0000000..d575a56
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/collection/grid.liquid
@@ -0,0 +1,3 @@
+<section class="products" data-count="{{ collection.products | size }}">
+{% for product in collection.products %}  {% render "snippets.product.card", product: product, label: collection.label, position: forloop.index %}
+{% endfor %}</section>
diff --git a/performance/themes/complex-collection/collection_header.liquid b/performance/themes/complex-collection/snippets/collection/header.liquid
similarity index 66%
rename from performance/themes/complex-collection/collection_header.liquid
rename to performance/themes/complex-collection/snippets/collection/header.liquid
index e521680..9bc83bd 100644
--- a/performance/themes/complex-collection/collection_header.liquid
+++ b/performance/themes/complex-collection/snippets/collection/header.liquid
@@ -3,4 +3,5 @@
   <h1>{{ collection.title }}</h1>
   <p>{{ collection.description }}</p>
   <p class="count">{{ collection.products | size }} products selected</p>
+  {% render "snippets.shared.button", label: "Shop all arrivals", url: "/collections/summer-essentials", icon: "arrow", tone: "primary" %}
 </header>
diff --git a/performance/themes/complex-collection/snippets/collection/navigation.liquid b/performance/themes/complex-collection/snippets/collection/navigation.liquid
new file mode 100644
index 0000000..7ebdacf
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/collection/navigation.liquid
@@ -0,0 +1,6 @@
+<nav aria-label="Collection filters" class="collection-navigation">
+  <p>{% render "snippets.shared.icon", name: "filter" %} Filter by</p>
+  <ul>{% for tag in collection.tags %}
+    <li data-position="{{ forloop.index }}">{{ tag | replace: " ", "-" | upcase }}</li>{% endfor %}
+  </ul>
+</nav>
diff --git a/performance/themes/complex-collection/snippets/index/featured_products.liquid b/performance/themes/complex-collection/snippets/index/featured_products.liquid
new file mode 100644
index 0000000..3868294
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/index/featured_products.liquid
@@ -0,0 +1,6 @@
+<section class="featured-products">
+  <header><p class="eyebrow">Editor’s picks</p><h2>Useful things for every day</h2></header>
+  <div class="featured-products__grid">
+{% for product in collection.products limit: 6 %}    {% render "snippets.product.card", product: product, label: "featured", position: forloop.index %}
+{% endfor %}  </div>
+</section>
diff --git a/performance/themes/complex-collection/snippets/index/hero.liquid b/performance/themes/complex-collection/snippets/index/hero.liquid
new file mode 100644
index 0000000..1b60169
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/index/hero.liquid
@@ -0,0 +1,6 @@
+<section class="home-hero">
+  <p class="eyebrow">Field notes / {{ collection.label | upcase }}</p>
+  <h1>{{ collection.title }}</h1>
+  <p>{{ collection.description }}</p>
+  {% render "snippets.shared.button", label: "Explore the collection", url: "/collections/summer-essentials", icon: "arrow", tone: "primary" %}
+</section>
diff --git a/performance/themes/complex-collection/snippets/index/journal.liquid b/performance/themes/complex-collection/snippets/index/journal.liquid
new file mode 100644
index 0000000..9ce3c3d
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/index/journal.liquid
@@ -0,0 +1,6 @@
+<section class="journal-preview">
+  <header><p class="eyebrow">From the journal</p><h2>Better everyday rituals</h2></header>
+  <div class="journal-preview__entries">
+{% for article in articles %}    <article><h3>{{ article.title }}</h3><p>{{ article.excerpt }}</p>{% render "snippets.shared.button", label: "Read article", url: "/blogs/journal", icon: "arrow", tone: "text" %}</article>
+{% endfor %}  </div>
+</section>
diff --git a/performance/themes/complex-collection/snippets/page/content.liquid b/performance/themes/complex-collection/snippets/page/content.liquid
new file mode 100644
index 0000000..d777473
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/page/content.liquid
@@ -0,0 +1,4 @@
+<article class="content-page__body">
+  <p>{{ page.content }}</p>
+  {% render "snippets.shared.button", label: "Contact us", url: "/pages/contact", icon: "arrow", tone: "secondary" %}
+</article>
diff --git a/performance/themes/complex-collection/snippets/page/header.liquid b/performance/themes/complex-collection/snippets/page/header.liquid
new file mode 100644
index 0000000..cc162b5
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/page/header.liquid
@@ -0,0 +1,4 @@
+<header class="content-page__header">
+  <p class="eyebrow">{% render "snippets.shared.icon", name: "arrow" %} Northstar journal</p>
+  <h1>{{ page.title }}</h1>
+</header>
diff --git a/performance/themes/complex-collection/product_card.liquid b/performance/themes/complex-collection/snippets/product/card.liquid
similarity index 56%
rename from performance/themes/complex-collection/product_card.liquid
rename to performance/themes/complex-collection/snippets/product/card.liquid
index 9a56c60..6251020 100644
--- a/performance/themes/complex-collection/product_card.liquid
+++ b/performance/themes/complex-collection/snippets/product/card.liquid
@@ -1,9 +1,9 @@
 <article data-handle="{{ product.handle }}" data-position="{{ position }}" class="product-card">
-  {% render "product_media", product: product %}
+  {% render "snippets.product.media", product: product %}
   <div class="product-card__details">
     <p class="product-card__vendor">{{ product.vendor | upcase }}</p>
     <h2>{{ product.title }}</h2>
-    {% render "product_pricing", product: product %}
-    {% render "product_metadata", product: product, label: label %}
+    {% render "snippets.product.pricing", product: product %}
+    {% render "snippets.product.metadata", product: product, label: label %}
   </div>
 </article>
diff --git a/performance/themes/complex-collection/snippets/product/detail.liquid b/performance/themes/complex-collection/snippets/product/detail.liquid
new file mode 100644
index 0000000..f3b9a88
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/product/detail.liquid
@@ -0,0 +1,10 @@
+<article class="product-detail">
+  {% render "snippets.product.media", product: product %}
+  <div class="product-detail__content">
+    <p class="eyebrow">{{ product.vendor | upcase }}</p>
+    <h1>{{ product.title }}</h1>
+    {% render "snippets.product.pricing", product: product %}
+    {% render "snippets.product.metadata", product: product, label: "featured item" %}
+    {% render "snippets.shared.button", label: "Add to cart", url: "/cart/add", icon: "bag", tone: "primary" %}
+  </div>
+</article>
diff --git a/performance/themes/complex-collection/product_media.liquid b/performance/themes/complex-collection/snippets/product/media.liquid
similarity index 100%
rename from performance/themes/complex-collection/product_media.liquid
rename to performance/themes/complex-collection/snippets/product/media.liquid
diff --git a/performance/themes/complex-collection/product_metadata.liquid b/performance/themes/complex-collection/snippets/product/metadata.liquid
similarity index 100%
rename from performance/themes/complex-collection/product_metadata.liquid
rename to performance/themes/complex-collection/snippets/product/metadata.liquid
diff --git a/performance/themes/complex-collection/product_pricing.liquid b/performance/themes/complex-collection/snippets/product/pricing.liquid
similarity index 57%
rename from performance/themes/complex-collection/product_pricing.liquid
rename to performance/themes/complex-collection/snippets/product/pricing.liquid
index 47219fe..59ebdbd 100644
--- a/performance/themes/complex-collection/product_pricing.liquid
+++ b/performance/themes/complex-collection/snippets/product/pricing.liquid
@@ -1,5 +1,5 @@
 <p class="product-card__pricing">
-  <span class="price">{{ product.price_cents | fixture_money }}</span>
-  {% if product.compare_at_price_cents > product.price_cents %}<s>{{ product.compare_at_price_cents | fixture_money }}</s>{% endif %}
+  {% render "snippets.shared.price", cents: product.price_cents %}
+  {% if product.compare_at_price_cents > product.price_cents %}<s>{% render "snippets.shared.price", cents: product.compare_at_price_cents %}</s>{% endif %}
   <span class="saving">{{ product.compare_at_price_cents | minus: product.price_cents | fixture_money }}</span>
 </p>
diff --git a/performance/themes/complex-collection/snippets/shared/button.liquid b/performance/themes/complex-collection/snippets/shared/button.liquid
new file mode 100644
index 0000000..f8724ec
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/shared/button.liquid
@@ -0,0 +1 @@
+<a class="button button--{{ tone }}" href="{{ url }}">{% render "snippets.shared.icon", name: icon %}{{ label }}</a>
diff --git a/performance/themes/complex-collection/snippets/shared/icon.liquid b/performance/themes/complex-collection/snippets/shared/icon.liquid
new file mode 100644
index 0000000..81b4ff2
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/shared/icon.liquid
@@ -0,0 +1,3 @@
+{% if name == "arrow" %}<svg aria-hidden="true" class="icon icon--arrow" viewBox="0 0 12 12"><path d="M1 6h9M7 2l4 4-4 4"/></svg>{% endif %}
+{% if name == "bag" %}<svg aria-hidden="true" class="icon icon--bag" viewBox="0 0 12 12"><path d="M2 4h8l-1 7H3L2 4zm2 0a2 2 0 014 0"/></svg>{% endif %}
+{% if name == "filter" %}<svg aria-hidden="true" class="icon icon--filter" viewBox="0 0 12 12"><path d="M1 2h10L7 7v3l-2 1V7L1 2z"/></svg>{% endif %}
diff --git a/performance/themes/complex-collection/snippets/shared/price.liquid b/performance/themes/complex-collection/snippets/shared/price.liquid
new file mode 100644
index 0000000..296b1f8
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/shared/price.liquid
@@ -0,0 +1 @@
+<span class="price">{{ cents | fixture_money }}</span>
diff --git a/performance/themes/complex-collection/snippets/shared/site_footer.liquid b/performance/themes/complex-collection/snippets/shared/site_footer.liquid
new file mode 100644
index 0000000..2b2b7c9
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/shared/site_footer.liquid
@@ -0,0 +1,6 @@
+<footer class="site-footer">
+  <p>All prices are in {{ shop.currency }}.</p>
+  <nav aria-label="Footer navigation">{% for link in links %}
+    <a href="{{ link.url }}">{{ link.title }}</a>{% unless forloop.last %} / {% endunless %}{% endfor %}
+  </nav>
+</footer>
diff --git a/performance/themes/complex-collection/snippets/shared/site_header.liquid b/performance/themes/complex-collection/snippets/shared/site_header.liquid
new file mode 100644
index 0000000..2a5c7e7
--- /dev/null
+++ b/performance/themes/complex-collection/snippets/shared/site_header.liquid
@@ -0,0 +1,9 @@
+<header class="site-header">
+  <a href="/" class="site-header__brand">{{ shop.name }}</a>
+  <nav aria-label="Main navigation">
+    <ul>{% for link in links %}
+      <li><a href="{{ link.url }}">{{ link.title }}</a></li>{% endfor %}
+    </ul>
+  </nav>
+  <p class="site-header__cart">{% render "snippets.shared.icon", name: "bag" %} Cart: {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} / {{ cart.total_price | fixture_money }}</p>
+</header>
diff --git a/performance/themes/complex-collection/templates/collection.liquid b/performance/themes/complex-collection/templates/collection.liquid
new file mode 100644
index 0000000..aba3ae6
--- /dev/null
+++ b/performance/themes/complex-collection/templates/collection.liquid
@@ -0,0 +1,10 @@
+{% assign product_count = collection.products | size %}
+{% if product_count > 0 %}
+<main data-collection="{{ collection.handle }}" class="collection-page">
+  {% render "snippets.collection.header", collection: collection %}
+  {% render "snippets.collection.navigation", collection: collection %}
+  {% render "snippets.collection.grid", collection: collection %}
+</main>
+{% else %}
+<main class="collection-page"><p class="collection-page__empty">No products found in this collection.</p></main>
+{% endif %}
diff --git a/performance/themes/complex-collection/templates/index.liquid b/performance/themes/complex-collection/templates/index.liquid
new file mode 100644
index 0000000..6b019cf
--- /dev/null
+++ b/performance/themes/complex-collection/templates/index.liquid
@@ -0,0 +1,5 @@
+<main class="home-page">
+  {% render "snippets.index.hero", collection: collection %}
+  {% render "snippets.index.featured_products", collection: collection %}
+  {% render "snippets.index.journal", articles: articles %}
+</main>
diff --git a/performance/themes/complex-collection/templates/page.liquid b/performance/themes/complex-collection/templates/page.liquid
new file mode 100644
index 0000000..7c7cfb2
--- /dev/null
+++ b/performance/themes/complex-collection/templates/page.liquid
@@ -0,0 +1,4 @@
+<main class="content-page">
+  {% render "snippets.page.header", page: page %}
+  {% render "snippets.page.content", page: page %}
+</main>
diff --git a/performance/themes/complex-collection/templates/product.liquid b/performance/themes/complex-collection/templates/product.liquid
new file mode 100644
index 0000000..e91566b
--- /dev/null
+++ b/performance/themes/complex-collection/templates/product.liquid
@@ -0,0 +1,3 @@
+<main data-handle="{{ product.handle }}" class="product-page">
+  {% render "snippets.product.detail", product: product %}
+</main>
diff --git a/performance/themes/complex-collection/theme.liquid b/performance/themes/complex-collection/theme.liquid
deleted file mode 100644
index a988084..0000000
--- a/performance/themes/complex-collection/theme.liquid
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <title>{{ shop.name }} &mdash; {{ page_title }}</title>
-  <meta charset="utf-8">
-</head>
-<body id="page-{{ template }}">
-  <header class="site-header">
-    <a href="/" class="site-header__brand">{{ shop.name }}</a>
-    <nav aria-label="Main navigation">
-      <ul>{% for link in linklists.main-menu.links %}
-        <li><a href="{{ link.url }}">{{ link.title }}</a></li>{% endfor %}
-      </ul>
-    </nav>
-    <p class="site-header__cart">Cart: {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} / {{ cart.total_price | fixture_money }}</p>
-  </header>
-  <div class="site-layout">
-    <aside class="site-layout__sidebar">
-      <h2>{{ collection.title }} tags</h2>
-      <ul>{% for tag in collection.tags %}
-        <li>{{ tag | replace: ' ', '-' | upcase }}</li>{% endfor %}
-      </ul>
-    </aside>
-    {{ content_for_layout }}
-  </div>
-  <footer class="site-footer">
-    <p>All prices are in {{ shop.currency }}.</p>
-    <nav aria-label="Footer navigation">{% for link in linklists.footer.links %}
-      <a href="{{ link.url }}">{{ link.title }}</a>{% unless forloop.last %} / {% endunless %}{% endfor %}
-    </nav>
-  </footer>
-</body>
-</html>
diff --git a/tests/Integration/Performance/ComplexThemeFixtureTest.php b/tests/Integration/Performance/ComplexThemeFixtureTest.php
index 4135141..0bfc9fd 100644
--- a/tests/Integration/Performance/ComplexThemeFixtureTest.php
+++ b/tests/Integration/Performance/ComplexThemeFixtureTest.php
@@ -2,25 +2,34 @@
 
 use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
 
-test('complex theme fixture renders the deterministic collection page', function () {
+test('complex theme fixture renders every page through the shared layout', function () {
     $environment = ComplexThemeFixture::environment();
 
-    $page = $environment->parseTemplate(ComplexThemeFixture::rootTemplateName());
-    $layout = $environment->parseTemplate(ComplexThemeFixture::LAYOUT_TEMPLATE_NAME);
+    expect(ComplexThemeFixture::templateNames())
+        ->toContain('layout.theme')
+        ->toContain('templates.index')
+        ->toContain('templates.collection')
+        ->toContain('templates.product')
+        ->toContain('templates.page')
+        ->toContain('snippets.shared.button')
+        ->toContain('snippets.product.card');
 
-    $content = $page->render(ComplexThemeFixture::newRenderContext($environment));
-    $rendered = $layout->render(ComplexThemeFixture::newLayoutRenderContext($environment, $content));
+    foreach ([
+        'templates.index' => 'Better everyday rituals',
+        'templates.collection' => '24 products selected',
+        'templates.product' => 'Weekend Bag',
+        'templates.page' => 'Northstar journal',
+    ] as $templateName => $expectedContent) {
+        $rendered = ComplexThemeFixture::renderPage($environment, $templateName);
+        $streamed = implode('', iterator_to_array(
+            ComplexThemeFixture::streamPage($environment, $templateName),
+            false,
+        ));
 
-    $streamedContent = $page->stream(ComplexThemeFixture::newRenderContext($environment));
-    $streamed = implode('', iterator_to_array(
-        $layout->stream(ComplexThemeFixture::newLayoutRenderContext($environment, $streamedContent)),
-        false,
-    ));
-
-    expect($rendered)
-        ->toContain('<title>Northstar Goods &mdash; Summer Essentials</title>')
-        ->toContain('24 products selected')
-        ->toContain('data-handle="sketchbook"')
-        ->and(hash('sha256', $rendered))->toBe('52a906d56a26957edbf34fc85ed8dc76e3ccb74f9aa012effd5fd84de5e732eb')
-        ->and($streamed)->toBe($rendered);
+        expect($rendered)
+            ->toContain('<header class="site-header">')
+            ->toContain($expectedContent)
+            ->toContain('<footer class="site-footer">')
+            ->and($streamed)->toBe($rendered);
+    }
 });

From e9886aca61308e99c117d0bf21f670aaf51858c6 Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 11:56:55 +0200
Subject: [PATCH 06/11] Fix benchmark measurement and CI warmup issues

- ThemeBench read template sources inside the timed loop, so benchTokenize
  and benchParse measured the filesystem: 313us of the ~840us per rev were
  file_get_contents calls. Sources are now read once in setUp.
- The theme used a pluralize filter that does not exist in this library.
  Unknown filters return their input unmodified, so the cart line rendered
  as "Cart: 3 3". Added fixture_pluralize and asserted on the rendered
  output so a missing filter cannot pass silently again.
- The CI segfault exclusion only named benchLoadAndRenderVarExporter, while
  the new benchBuildVarExporter subject ran unfiltered.
- Restored warmup, dropped in the suite revamp. Passing it on the command
  line rather than via attributes keeps the base and PR runs symmetric
  regardless of what the base commit declares.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .github/workflows/phpbench.yml                 | 10 ++++++----
 composer.json                                  |  4 ++--
 .../benchmarks/Support/ComplexThemeFixture.php |  5 +++++
 performance/benchmarks/ThemeBench.php          | 18 ++++++++++++++----
 .../snippets/shared/site_header.liquid         |  2 +-
 .../Performance/ComplexThemeFixtureTest.php    |  3 +++
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/phpbench.yml b/.github/workflows/phpbench.yml
index b61d731..27d4657 100644
--- a/.github/workflows/phpbench.yml
+++ b/.github/workflows/phpbench.yml
@@ -14,11 +14,11 @@ permissions:
 
 env:
   REQUIRED_PHP_EXTENSIONS: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-  # TemplateCacheBench::benchLoadAndRenderVarExporter segfaults on CI for PHP 8.4/8.5. Exclude it on
+  # TemplateCacheBench's var-export subjects segfault on CI for PHP 8.4/8.5. Exclude them on
   # every version, not just those two: a benchmark set that varies per PHP version makes
   # the per-version comparison summaries incomparable with each other. Local runs are
-  # unfiltered, so the benchmark still exists — it just does not gate PRs.
-  PHPBENCH_FILTER: '^(?!.*TemplateCacheBench::benchLoadAndRenderVarExporter$).*'
+  # unfiltered, so the benchmarks still exist — they just do not gate PRs.
+  PHPBENCH_FILTER: '^(?!.*TemplateCacheBench::bench(Build|LoadAndRender)VarExporter$).*'
 
 jobs:
   benchmark:
@@ -81,6 +81,7 @@ jobs:
             --group=macro \
             --filter="$PHPBENCH_FILTER" \
             --progress=none \
+            --warmup=1 \
             --retry-threshold=5 \
             --report=aggregate \
             --output=json > "$WORKSPACE/pr.json"
@@ -93,6 +94,7 @@ jobs:
           vendor/bin/phpbench run \
             --filter="$PHPBENCH_FILTER" \
             --progress=none \
+            --warmup=1 \
             --retry-threshold=5 \
             --report=aggregate \
             --output=json > "$WORKSPACE/base.json"
@@ -105,7 +107,7 @@ jobs:
           PHPBENCH_PHP_VERSION: ${{ matrix.php }}
           PHPBENCH_BASE_SHA: ${{ github.event.pull_request.base.sha }}
           PHPBENCH_PR_SHA: ${{ github.event.pull_request.head.sha }}
-          PHPBENCH_WARMUP: '0'
+          PHPBENCH_WARMUP: '1'
         run: |
           set +e
           export PHPBENCH_RUNNER="${ImageOS:-$RUNNER_OS}"
diff --git a/composer.json b/composer.json
index d9ac60f..3524173 100644
--- a/composer.json
+++ b/composer.json
@@ -51,8 +51,8 @@
             "pint",
             "phpstan analyse"
         ],
-        "benchmark": "phpbench run --group=macro --retry-threshold=5 --report=aggregate",
-        "benchmark:micro": "phpbench run --group=micro --retry-threshold=5 --report=aggregate",
+        "benchmark": "phpbench run --group=macro --warmup=1 --retry-threshold=5 --report=aggregate",
+        "benchmark:micro": "phpbench run --group=micro --warmup=1 --retry-threshold=5 --report=aggregate",
         "profile": "phpbench xdebug:profile"
     },
     "config": {
diff --git a/performance/benchmarks/Support/ComplexThemeFixture.php b/performance/benchmarks/Support/ComplexThemeFixture.php
index 0dcceb0..3898012 100644
--- a/performance/benchmarks/Support/ComplexThemeFixture.php
+++ b/performance/benchmarks/Support/ComplexThemeFixture.php
@@ -238,6 +238,11 @@ public function fixtureMoney(int|float $cents): string
     {
         return '€'.number_format($cents / 100, 2, '.', '');
     }
+
+    public function fixturePluralize(int $count, string $singular, string $plural): string
+    {
+        return $count === 1 ? $singular : $plural;
+    }
 }
 
 final class ComplexThemeProduct extends Drop
diff --git a/performance/benchmarks/ThemeBench.php b/performance/benchmarks/ThemeBench.php
index b684d9e..786cedb 100644
--- a/performance/benchmarks/ThemeBench.php
+++ b/performance/benchmarks/ThemeBench.php
@@ -21,26 +21,36 @@ class ThemeBench
 {
     private Environment $environment;
 
+    /**
+     * Template sources are read up front: reading them inside the benchmark
+     * would measure the filesystem instead of the tokenizer and the parser.
+     *
+     * @var array<string, string>
+     */
+    private array $sources;
+
     public function setUp(): void
     {
         $this->environment = ComplexThemeFixture::environment();
+        $this->sources = [];
 
         foreach (ComplexThemeFixture::templateNames() as $name) {
             $this->environment->parseTemplate($name);
+            $this->sources[$name] = ComplexThemeFixture::templateSource($name);
         }
     }
 
     public function benchTokenize(): void
     {
-        foreach (ComplexThemeFixture::templateNames() as $name) {
-            $this->environment->newParseContext()->tokenize(ComplexThemeFixture::templateSource($name));
+        foreach ($this->sources as $source) {
+            $this->environment->newParseContext()->tokenize($source);
         }
     }
 
     public function benchParse(): void
     {
-        foreach (ComplexThemeFixture::templateNames() as $name) {
-            $this->environment->parseString(ComplexThemeFixture::templateSource($name), $name);
+        foreach ($this->sources as $name => $source) {
+            $this->environment->parseString($source, $name);
         }
     }
 
diff --git a/performance/themes/complex-collection/snippets/shared/site_header.liquid b/performance/themes/complex-collection/snippets/shared/site_header.liquid
index 2a5c7e7..f21b740 100644
--- a/performance/themes/complex-collection/snippets/shared/site_header.liquid
+++ b/performance/themes/complex-collection/snippets/shared/site_header.liquid
@@ -5,5 +5,5 @@
       <li><a href="{{ link.url }}">{{ link.title }}</a></li>{% endfor %}
     </ul>
   </nav>
-  <p class="site-header__cart">{% render "snippets.shared.icon", name: "bag" %} Cart: {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} / {{ cart.total_price | fixture_money }}</p>
+  <p class="site-header__cart">{% render "snippets.shared.icon", name: "bag" %} Cart: {{ cart.item_count }} {{ cart.item_count | fixture_pluralize: 'item', 'items' }} / {{ cart.total_price | fixture_money }}</p>
 </header>
diff --git a/tests/Integration/Performance/ComplexThemeFixtureTest.php b/tests/Integration/Performance/ComplexThemeFixtureTest.php
index 0bfc9fd..df72e5d 100644
--- a/tests/Integration/Performance/ComplexThemeFixtureTest.php
+++ b/tests/Integration/Performance/ComplexThemeFixtureTest.php
@@ -28,6 +28,9 @@
 
         expect($rendered)
             ->toContain('<header class="site-header">')
+            // Unknown filters render as their unmodified input, so assert on
+            // filtered output to keep a missing filter from passing silently.
+            ->toContain('Cart: 3 items / €126.50')
             ->toContain($expectedContent)
             ->toContain('<footer class="site-footer">')
             ->and($streamed)->toBe($rendered);

From e0a0acf65b7081e0b24d29c002a4769009e9de75 Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 11:59:08 +0200
Subject: [PATCH 07/11] Remove the unused Shopify benchmark harness

LiquidBench was the only consumer of the old Shopify theme fixture, so
deleting it left the whole harness unreachable: ThemeRunner, the theme test
template pair, CommentFormTag, PaginateTag, CustomFilters, Database with its
vision.database.yml, and the 34 template files under performance/tests.

symfony/yaml went with Database, its only user, and the phpstan baseline
entries for the removed files are gone too.

DatabaseDrop stays: OperationBench still uses it for the drop benchmarks.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 composer.json                               |   3 +-
 performance/CompiledThemeTestTemplate.php   |  57 --
 performance/Shopify/CommentFormTag.php      |  69 --
 performance/Shopify/CustomFilters.php       | 228 -----
 performance/Shopify/Database.php            | 125 ---
 performance/Shopify/PaginateTag.php         | 124 ---
 performance/Shopify/vision.database.yml     | 945 --------------------
 performance/ThemeRunner.php                 | 110 ---
 performance/ThemeTestTemplate.php           |  33 -
 performance/tests/dropify/article.liquid    |  74 --
 performance/tests/dropify/blog.liquid       |  33 -
 performance/tests/dropify/cart.liquid       |  66 --
 performance/tests/dropify/collection.liquid |  22 -
 performance/tests/dropify/index.liquid      |  47 -
 performance/tests/dropify/page.liquid       |   8 -
 performance/tests/dropify/product.liquid    |  68 --
 performance/tests/dropify/theme.liquid      | 105 ---
 performance/tests/ripen/article.liquid      |  74 --
 performance/tests/ripen/blog.liquid         |  13 -
 performance/tests/ripen/cart.liquid         |  54 --
 performance/tests/ripen/collection.liquid   |  29 -
 performance/tests/ripen/index.liquid        |  32 -
 performance/tests/ripen/page.liquid         |   4 -
 performance/tests/ripen/product.liquid      |  75 --
 performance/tests/ripen/theme.liquid        |  85 --
 performance/tests/tribble/404.liquid        |  56 --
 performance/tests/tribble/article.liquid    |  98 --
 performance/tests/tribble/blog.liquid       |  41 -
 performance/tests/tribble/cart.liquid       | 134 ---
 performance/tests/tribble/collection.liquid |  70 --
 performance/tests/tribble/index.liquid      |  94 --
 performance/tests/tribble/page.liquid       |  56 --
 performance/tests/tribble/product.liquid    | 116 ---
 performance/tests/tribble/search.liquid     |  51 --
 performance/tests/tribble/theme.liquid      |  90 --
 performance/tests/vogue/article.liquid      |  66 --
 performance/tests/vogue/blog.liquid         |  32 -
 performance/tests/vogue/cart.liquid         |  58 --
 performance/tests/vogue/collection.liquid   |  19 -
 performance/tests/vogue/index.liquid        |  22 -
 performance/tests/vogue/page.liquid         |   3 -
 performance/tests/vogue/product.liquid      |  62 --
 performance/tests/vogue/theme.liquid        | 122 ---
 phpstan-baseline.neon                       |  20 -
 44 files changed, 1 insertion(+), 3692 deletions(-)
 delete mode 100644 performance/CompiledThemeTestTemplate.php
 delete mode 100644 performance/Shopify/CommentFormTag.php
 delete mode 100644 performance/Shopify/CustomFilters.php
 delete mode 100644 performance/Shopify/Database.php
 delete mode 100644 performance/Shopify/PaginateTag.php
 delete mode 100644 performance/Shopify/vision.database.yml
 delete mode 100644 performance/ThemeRunner.php
 delete mode 100644 performance/ThemeTestTemplate.php
 delete mode 100644 performance/tests/dropify/article.liquid
 delete mode 100644 performance/tests/dropify/blog.liquid
 delete mode 100644 performance/tests/dropify/cart.liquid
 delete mode 100644 performance/tests/dropify/collection.liquid
 delete mode 100644 performance/tests/dropify/index.liquid
 delete mode 100644 performance/tests/dropify/page.liquid
 delete mode 100644 performance/tests/dropify/product.liquid
 delete mode 100644 performance/tests/dropify/theme.liquid
 delete mode 100644 performance/tests/ripen/article.liquid
 delete mode 100644 performance/tests/ripen/blog.liquid
 delete mode 100644 performance/tests/ripen/cart.liquid
 delete mode 100644 performance/tests/ripen/collection.liquid
 delete mode 100644 performance/tests/ripen/index.liquid
 delete mode 100644 performance/tests/ripen/page.liquid
 delete mode 100644 performance/tests/ripen/product.liquid
 delete mode 100644 performance/tests/ripen/theme.liquid
 delete mode 100644 performance/tests/tribble/404.liquid
 delete mode 100644 performance/tests/tribble/article.liquid
 delete mode 100644 performance/tests/tribble/blog.liquid
 delete mode 100644 performance/tests/tribble/cart.liquid
 delete mode 100644 performance/tests/tribble/collection.liquid
 delete mode 100644 performance/tests/tribble/index.liquid
 delete mode 100644 performance/tests/tribble/page.liquid
 delete mode 100644 performance/tests/tribble/product.liquid
 delete mode 100644 performance/tests/tribble/search.liquid
 delete mode 100644 performance/tests/tribble/theme.liquid
 delete mode 100644 performance/tests/vogue/article.liquid
 delete mode 100644 performance/tests/vogue/blog.liquid
 delete mode 100644 performance/tests/vogue/cart.liquid
 delete mode 100644 performance/tests/vogue/collection.liquid
 delete mode 100644 performance/tests/vogue/index.liquid
 delete mode 100644 performance/tests/vogue/page.liquid
 delete mode 100644 performance/tests/vogue/product.liquid
 delete mode 100644 performance/tests/vogue/theme.liquid

diff --git a/composer.json b/composer.json
index 3524173..6be6d7d 100644
--- a/composer.json
+++ b/composer.json
@@ -30,8 +30,7 @@
         "spatie/invade": "^2.0",
         "spatie/ray": "^1.28",
         "symfony/console": "^7.0 || ^8.0",
-        "symfony/var-exporter": "^7.0 || ^8.0",
-        "symfony/yaml": "^7.0 || ^8.0"
+        "symfony/var-exporter": "^7.0 || ^8.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/performance/CompiledThemeTestTemplate.php b/performance/CompiledThemeTestTemplate.php
deleted file mode 100644
index 65c6d6a..0000000
--- a/performance/CompiledThemeTestTemplate.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance;
-
-use Keepsuit\Liquid\Environment;
-use Keepsuit\Liquid\Render\RenderContext;
-use Keepsuit\Liquid\Template;
-
-class CompiledThemeTestTemplate
-{
-    public function __construct(
-        protected Environment $environment,
-        public string $templateName,
-        public Template $template,
-        public ?Template $layout,
-    ) {}
-
-    public function pageTemplate(): string
-    {
-        return basename($this->templateName);
-    }
-
-    public function render(array $assigns = []): void
-    {
-        $content = $this->template->render($this->buildContext($assigns));
-
-        if ($this->layout) {
-            $this->layout->render($this->buildContext([
-                ...$assigns,
-                'content_for_layout' => $content,
-            ]));
-        }
-    }
-
-    public function stream(array $assigns = []): void
-    {
-        $content = $this->template->stream($this->buildContext($assigns));
-
-        if ($this->layout) {
-            $content = $this->layout->stream($this->buildContext([
-                ...$assigns,
-                'content_for_layout' => $content,
-            ]));
-        }
-
-        while ($content->valid()) {
-            $content->next();
-        }
-    }
-
-    protected function buildContext(array $assigns = []): RenderContext
-    {
-        return $this->environment->newRenderContext(
-            staticData: $assigns,
-        );
-    }
-}
diff --git a/performance/Shopify/CommentFormTag.php b/performance/Shopify/CommentFormTag.php
deleted file mode 100644
index acd0048..0000000
--- a/performance/Shopify/CommentFormTag.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance\Shopify;
-
-use Keepsuit\Liquid\Exceptions\SyntaxException;
-use Keepsuit\Liquid\Nodes\BodyNode;
-use Keepsuit\Liquid\Nodes\VariableLookup;
-use Keepsuit\Liquid\Parse\TagParseContext;
-use Keepsuit\Liquid\Render\RenderContext;
-use Keepsuit\Liquid\TagBlock;
-
-class CommentFormTag extends TagBlock
-{
-    protected string $variableName;
-
-    protected array $attributes;
-
-    protected BodyNode $body;
-
-    public static function tagName(): string
-    {
-        return 'form';
-    }
-
-    public function parse(TagParseContext $context): static
-    {
-        assert($context->body !== null);
-        $this->body = $context->body;
-
-        $variableName = $context->params->expression();
-        $this->variableName = match (true) {
-            $variableName instanceof VariableLookup, is_string($variableName) => (string) $variableName,
-            default => throw new SyntaxException('Invalid variable name'),
-        };
-
-        $this->attributes = [];
-
-        $context->params->assertEnd();
-
-        return $this;
-    }
-
-    public function render(RenderContext $context): string
-    {
-        $article = $context->get($this->variableName);
-        assert(is_array($article));
-
-        $context->stack(function (RenderContext $context) {
-            $context->set('form', [
-                'posted_successfully?' => $context->getRegister('posted_successfully'),
-                'errors' => $context->get('comment.errors'),
-                'author' => $context->get('comment.author'),
-                'email' => $context->get('comment.email'),
-                'body' => $context->get('comment.body'),
-            ]);
-        });
-
-        return $this->wrapInForm($article, $this->body->render($context));
-    }
-
-    protected function wrapInForm(array $article, string $input): string
-    {
-        return <<<HTML
-        <form id="article-{$article['id']}-comment-form" class="comment-form" method="post" action="">
-        $input
-        </form>
-        HTML;
-    }
-}
diff --git a/performance/Shopify/CustomFilters.php b/performance/Shopify/CustomFilters.php
deleted file mode 100644
index f35c944..0000000
--- a/performance/Shopify/CustomFilters.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance\Shopify;
-
-use Keepsuit\Liquid\Exceptions\InvalidArgumentException;
-use Keepsuit\Liquid\Filters\FiltersProvider;
-
-class CustomFilters extends FiltersProvider
-{
-    public function json(mixed $value): string
-    {
-        if ($value instanceof DatabaseDrop) {
-            $value = $value->toArray();
-        }
-
-        if (is_array($value) && array_key_exists('collections', $value)) {
-            $value = [...$value];
-            unset($value['collections']);
-        }
-
-        return json_encode($value, flags: JSON_THROW_ON_ERROR);
-    }
-
-    public function moneyWithCurrency(int|float|null $money): string
-    {
-        if ($money === null) {
-            return '';
-        }
-
-        return sprintf('$ %.2f USD', $money / 100);
-    }
-
-    public function money(int|float|null $money): string
-    {
-        if ($money === null) {
-            return '';
-        }
-
-        return sprintf('$ %.2f', $money / 100);
-    }
-
-    public function currency(): string
-    {
-        return 'USD';
-    }
-
-    public function weight(int|float $grams): string
-    {
-        return sprintf('%.2f', $grams / 1000);
-    }
-
-    public function weightWithUnit(int|float $grams): string
-    {
-        return $this->weight($grams).' kg';
-    }
-
-    public function linkToTag(string|int|float $label, string $tag): string
-    {
-        return sprintf(
-            '<a title="Show tag %s" href="/collections/%s/%s">%s</a>',
-            $tag,
-            $this->context->get('handle'),
-            $tag,
-            $label
-        );
-    }
-
-    public function highlightActiveTag(string|int|float $tag, string $cssClass = 'active'): string
-    {
-        $currentTags = $this->context->get('current_tags') ?? [];
-        assert(is_array($currentTags));
-
-        if (in_array($tag, $currentTags)) {
-            return sprintf('<span class="%s">%s</span>', $cssClass, $tag);
-        }
-
-        return (string) $tag;
-    }
-
-    public function linkToAddTag(string|int|float $label, string $tag): string
-    {
-        $currentTags = $this->context->get('current_tags');
-        $currentTags = is_array($currentTags) ? $currentTags : [];
-        $currentTags = array_values(array_filter($currentTags, is_string(...)));
-        $tags = array_unique([...$currentTags, $tag]);
-
-        return sprintf(
-            '<a title="Show tag %s" href="/collections/%s/%s">%s</a>',
-            $tag,
-            $this->context->get('handle'),
-            implode('+', $tags),
-            $label
-        );
-    }
-
-    public function linkToRemoveTag(string|int|float $label, string $tag): string
-    {
-        $currentTags = $this->context->get('current_tags');
-        $currentTags = is_array($currentTags) ? $currentTags : [];
-        $currentTags = array_values(array_filter($currentTags, is_string(...)));
-        $tags = array_values(array_filter($currentTags, fn (string $currentTag) => $currentTag !== $tag));
-
-        return sprintf(
-            '<a title="Show tag %s" href="/collections/%s/%s">%s</a>',
-            $tag,
-            $this->context->get('handle'),
-            implode('+', $tags),
-            $label
-        );
-    }
-
-    public function assetUrl(string $input): string
-    {
-        return "/files/1/[shop_id]/[shop_id]/assets/$input";
-    }
-
-    public function globalAssetUrl(string $input): string
-    {
-        return "/global/$input";
-    }
-
-    public function shopifyAssetUrl(string $input): string
-    {
-        return "/shopify/$input";
-    }
-
-    public function scriptTag(string $url): string
-    {
-        return sprintf('<script src="%s" type="text/javascript"></script>', $url);
-    }
-
-    public function stylesheetTag(string $url, string $media = 'all'): string
-    {
-        return sprintf('<link href="%s" rel="stylesheet" type="text/css" media="%s" />', $url, $media);
-    }
-
-    public function linkTo(string $link, string $url, string $title = ''): string
-    {
-        return sprintf('<a href="%s" title="%s">%s</a>', $url, $title, $link);
-    }
-
-    public function imgTag(string $url, string $alt = ''): string
-    {
-        return sprintf('<img src="%s" alt="%s" />', $url, $alt);
-    }
-
-    public function linkToVendor(?string $vendor): string
-    {
-        if ($vendor !== null) {
-            return $this->linkTo($this->urlForVendor($vendor), $vendor);
-        }
-
-        return 'Unknown vendor';
-    }
-
-    public function linkToType(?string $type): string
-    {
-        if ($type !== null) {
-            return $this->linkTo($this->urlForType($type), $type);
-        }
-
-        return 'Unknown vendor';
-    }
-
-    public function urlForVendor(string $vendor): string
-    {
-        return '/collections/'.$this->toHandle($vendor);
-    }
-
-    public function urlForType(string $type): string
-    {
-        return '/collections/'.$this->toHandle($type);
-    }
-
-    public function productImgUrl(string $url, string $style = 'small'): string
-    {
-        if (preg_match('/\Aproducts\/([\w\-_]+)\.(\w{2,4})/', $url, $matches) === 0) {
-            throw new InvalidArgumentException('filter "size" can only be called on product images');
-        }
-
-        $filename = $matches[1] ?? '';
-        $extension = $matches[2] ?? '';
-
-        return match ($style) {
-            'original' => '/files/shops/random_number/'.$url,
-            'grande', 'large', 'medium', 'compact', 'small', 'thumb', 'icon' => sprintf('/files/shops/random_number/products/%s_%s.%s', $filename, $style, $extension),
-            default => throw new InvalidArgumentException('valid parameters for filter "size" are: original, grande, large, medium, compact, small, thumb and icon '),
-        };
-    }
-
-    public function defaultPagination(array $paginate): string
-    {
-        $html = [];
-
-        if (isset($paginate['previous'])) {
-            $html[] = '<span class="prev">'.$this->linkTo($paginate['previous']['title'], $paginate['previous']['url']).'</span>';
-        }
-
-        foreach ($paginate['parts'] as $part) {
-            $html[] = match (true) {
-                $part['is_link'] => '<span class="page">'.$this->linkTo($part['title'], $part['url']).'</span>',
-                (int) $part['title'] == (int) $paginate['current_page'] => '<span class="page current">'.$part['title'].'</span>',
-                default => '<span class="deco">'.$part['title'].'</span>',
-            };
-        }
-
-        if (isset($paginate['next'])) {
-            $html[] = '<span class="next">'.$this->linkTo($paginate['next']['title'], $paginate['next']['url']).'</span>';
-        }
-
-        return implode(' ', $html);
-    }
-
-    public function pluralize(int|float $input, string $singular, string $plural): string
-    {
-        return $input === 1 ? $singular : $plural;
-    }
-
-    protected function toHandle(string $input): string
-    {
-        $result = $input;
-        $result = strtolower($result);
-        $result = str_replace(['\'', '"', '()', '[]'], '', $result);
-        $result = preg_replace('/\W+/', '-', $result) ?? $result;
-
-        return trim($result, '-');
-    }
-}
diff --git a/performance/Shopify/Database.php b/performance/Shopify/Database.php
deleted file mode 100644
index 635fa1b..0000000
--- a/performance/Shopify/Database.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance\Shopify;
-
-use Keepsuit\Liquid\Support\Arr;
-use Symfony\Component\Yaml\Yaml;
-
-class Database
-{
-    protected const DATABASE_FILE_PATH = __DIR__.'/vision.database.yml';
-
-    protected static ?array $tables = null;
-
-    public static function tables(): array
-    {
-        if (static::$tables !== null) {
-            return static::$tables;
-        }
-
-        $database = (array) Yaml::parseFile(static::DATABASE_FILE_PATH);
-        $products = is_array($database['products'] ?? null) ? $database['products'] : [];
-        $collections = is_array($database['collections'] ?? null) ? $database['collections'] : [];
-        $blogs = is_array($database['blogs'] ?? null) ? $database['blogs'] : [];
-        $lineItems = is_array($database['line_items'] ?? null) ? $database['line_items'] : [];
-
-        $database['products'] = array_map(
-            function (array $product) use ($collections) {
-                $collections = array_filter(
-                    $collections,
-                    fn (array $collection) => Arr::first(
-                        is_array($collection['products'] ?? null) ? $collection['products'] : [],
-                        fn (array $p) => $p['id'] === $product['id']
-                    ) !== null
-                );
-                $product['collections'] = array_values($collections);
-
-                return $product;
-            },
-            $products
-        );
-
-        $tables = [];
-        foreach ($database as $key => $values) {
-            if (! is_array($values)) {
-                continue;
-            }
-
-            $tables[$key] = array_reduce($values, function (array $acc, mixed $item) {
-                if (! is_array($item)) {
-                    return $acc;
-                }
-
-                if (isset($item['handle']) && is_string($item['handle'])) {
-                    $acc[$item['handle']] = $item;
-                } else {
-                    $acc[] = $item;
-                }
-
-                return $acc;
-            }, []);
-        }
-
-        $tables['collection'] = Arr::first($collections);
-        $tables['product'] = Arr::first($database['products']);
-        $tables['blog'] = Arr::first($blogs);
-        $articles = $tables['blog']['articles'] ?? [];
-        assert(is_array($articles));
-        $tables['article'] = Arr::first($articles);
-
-        $tables['cart'] = [
-            'total_price' => array_reduce($lineItems, function (int $total, mixed $item): int {
-                if (! is_array($item)) {
-                    return $total;
-                }
-
-                $linePrice = $item['line_price'] ?? 0;
-                $quantity = $item['quantity'] ?? 0;
-                if (! is_int($linePrice) && ! is_float($linePrice)) {
-                    $linePrice = 0;
-                }
-                if (! is_int($quantity) && ! is_float($quantity)) {
-                    $quantity = 0;
-                }
-
-                return (int) ($total + $linePrice * $quantity);
-            }, 0),
-            'item_count' => array_reduce($lineItems, function (int $total, mixed $item): int {
-                if (! is_array($item)) {
-                    return $total;
-                }
-
-                $quantity = $item['quantity'] ?? 0;
-                if (! is_int($quantity) && ! is_float($quantity)) {
-                    $quantity = 0;
-                }
-
-                return (int) ($total + $quantity);
-            }, 0),
-            'items' => $lineItems,
-        ];
-
-        return static::$tables = array_map(
-            static::toLiquidValue(...),
-            $tables,
-        );
-    }
-
-    protected static function toLiquidValue(mixed $value): mixed
-    {
-        if (! is_array($value)) {
-            return $value;
-        }
-
-        $values = array_map(
-            static::toLiquidValue(...),
-            $value,
-        );
-
-        if (array_is_list($value)) {
-            return $values;
-        }
-
-        return new DatabaseDrop($values);
-    }
-}
diff --git a/performance/Shopify/PaginateTag.php b/performance/Shopify/PaginateTag.php
deleted file mode 100644
index 7b00d65..0000000
--- a/performance/Shopify/PaginateTag.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance\Shopify;
-
-use Keepsuit\Liquid\Exceptions\InvalidArgumentException;
-use Keepsuit\Liquid\Exceptions\SyntaxException;
-use Keepsuit\Liquid\Nodes\BodyNode;
-use Keepsuit\Liquid\Nodes\Range;
-use Keepsuit\Liquid\Nodes\VariableLookup;
-use Keepsuit\Liquid\Parse\TagParseContext;
-use Keepsuit\Liquid\Parse\TokenType;
-use Keepsuit\Liquid\Render\RenderContext;
-use Keepsuit\Liquid\TagBlock;
-
-class PaginateTag extends TagBlock
-{
-    protected VariableLookup|string $collectionName;
-
-    protected int $pageSize = 20;
-
-    protected array $attributes;
-
-    protected BodyNode $body;
-
-    public static function tagName(): string
-    {
-        return 'paginate';
-    }
-
-    public function parse(TagParseContext $context): static
-    {
-        assert($context->body !== null);
-        $this->body = $context->body;
-
-        $collectionName = $context->params->expression();
-        $this->collectionName = match (true) {
-            $collectionName instanceof VariableLookup, is_string($collectionName) => (string) $collectionName,
-            default => throw new SyntaxException('Invalid collection name'),
-        };
-
-        if ($context->params->idOrFalse('by')) {
-            $this->pageSize = (int) $context->params->consume(TokenType::Number)->data;
-        }
-
-        if (! $context->params->isEnd()) {
-            dd('paginate', $context->params->current());
-        }
-
-        $context->params->assertEnd();
-
-        return $this;
-    }
-
-    public function render(RenderContext $context): string
-    {
-        return $context->stack(function (RenderContext $context) {
-            $currentPage = $context->get('current_page');
-            $currentPage = is_int($currentPage) ? $currentPage : 1;
-
-            $collection = $context->get($this->collectionName);
-            $collection = match (true) {
-                $collection instanceof Range => $collection->toArray(),
-                $collection instanceof \Iterator => iterator_to_array($collection),
-                default => $collection,
-            };
-            if (! is_array($collection)) {
-                throw new InvalidArgumentException(sprintf('Cannot paginate array %s. Not found.', $this->collectionName));
-            }
-
-            $collectionSize = count($collection);
-            $pageCount = ceil($collectionSize / $this->pageSize) + 1;
-
-            $pagination = [
-                'page_size' => $this->pageSize,
-                'current_page' => 5,
-                'current_offset' => $this->pageSize * 5,
-                'items' => $collectionSize,
-                'pages' => $pageCount - 1,
-                'previous' => $currentPage > 1 ? $this->link('&laquo; Previous', $currentPage - 1) : null,
-                'next' => $currentPage < $pageCount - 1 ? $this->link('Next &raquo;', $currentPage + 1) : null,
-                'parts' => [],
-            ];
-
-            if ($pageCount > 2) {
-                foreach (range(1, (int) $pageCount - 1) as $page) {
-                    $pagination['parts'][] = match (true) {
-                        $currentPage === $page => $this->noLink((string) $page),
-                        $page === 1 => $this->link((string) $page, $page),
-                        $page === $pageCount - 1 => $this->link((string) $page, $page),
-                        $page <= ($currentPage - (int) $this->attributes['window_size']) => $this->link('...', $page),
-                        $page >= ($currentPage + (int) $this->attributes['window_size']) => $this->link('...', $page),
-                        default => $this->link((string) $page, $page),
-                    };
-                }
-            }
-
-            $context->set('paginate', $pagination);
-
-            return $this->body->render($context);
-        });
-    }
-
-    protected function noLink(string $title): array
-    {
-        return [
-            'title' => $title,
-            'is_link' => false,
-        ];
-    }
-
-    protected function link(string $title, int $page): array
-    {
-        return [
-            'title' => $title,
-            'url' => $this->currentUrl().'?page='.$page,
-            'is_link' => true,
-        ];
-    }
-
-    protected function currentUrl(): string
-    {
-        return '/collections/frontpage';
-    }
-}
diff --git a/performance/Shopify/vision.database.yml b/performance/Shopify/vision.database.yml
deleted file mode 100644
index 9f38c30..0000000
--- a/performance/Shopify/vision.database.yml
+++ /dev/null
@@ -1,945 +0,0 @@
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#   Variants
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-product_variants:
-  - &product-1-var-1
-    id: 1
-    title: 151cm / Normal
-    price: 19900
-    weight: 1000
-    compare_at_price: 49900
-    available: true
-    inventory_quantity: 5
-    option1: 151cm
-    option2: Normal
-    option3:
-  - &product-1-var-2
-    id: 2
-    title: 155cm / Normal
-    price: 31900
-    weight: 1000
-    compare_at_price: 50900
-    available: true
-    inventory_quantity: 2
-    option1: 155cm
-    option2: Normal
-    option3:
-  - &product-2-var-1
-    id: 3
-    title: 162cm
-    price: 29900
-    weight: 1000
-    compare_at_price: 52900
-    available: true
-    inventory_quantity: 3
-    option1: 162cm
-    option2:
-    option3:
-  - &product-3-var-1
-    id: 4
-    title: 159cm
-    price: 19900
-    weight: 1000
-    compare_at_price:
-    available: true
-    inventory_quantity: 4
-    option1: 159cm
-    option2:
-    option3:
-  - &product-4-var-1
-    id: 5
-    title: 159cm
-    price: 19900
-    weight: 1000
-    compare_at_price: 32900
-    available: true
-    inventory_quantity: 6
-    option1: 159cm
-    option2:
-    option3:
-  - &product-1-var-3
-    id: 6
-    title: 158cm / Wide
-    price: 23900
-    weight: 1000
-    compare_at_price: 99900
-    available: false
-    inventory_quantity: 0
-    option1: 158cm
-    option2: Wide
-    option3:
-  - &product-3-var-2
-    id: 7
-    title: 162cm
-    price: 19900
-    weight: 1000
-    compare_at_price:
-    available: false
-    inventory_quantity: 0
-    option1: 162cm
-    option2:
-    option3:
-  - &product-3-var-3
-    id: 8
-    title: 165cm
-    price: 22900
-    weight: 1000
-    compare_at_price:
-    available: true
-    inventory_quantity: 4
-    option1: 165cm
-    option2:
-    option3:
-  - &product-5-var-1
-    id: 9
-    title: black / 42
-    price: 11900
-    weight: 500
-    compare_at_price: 22900
-    available: true
-    inventory_quantity: 1
-    option1: black
-    option2: 42
-    option3:
-  - &product-5-var-2
-    id: 10
-    title: beige / 42
-    price: 11900
-    weight: 500
-    compare_at_price: 22900
-    available: true
-    inventory_quantity: 3
-    option1: beige
-    option2: 42
-    option3:
-  - &product-5-var-3
-    id: 11
-    title: white / 42
-    price: 13900
-    weight: 500
-    compare_at_price: 24900
-    available: true
-    inventory_quantity: 1
-    option1: white
-    option2: 42
-    option3:
-  - &product-5-var-4
-    id: 12
-    title: black / 44
-    price: 11900
-    weight: 500
-    compare_at_price: 22900
-    available: true
-    inventory_quantity: 2
-    option1: black
-    option2: 44
-    option3:
-  - &product-5-var-5
-    id: 13
-    title: beige / 44
-    price: 11900
-    weight: 500
-    compare_at_price: 22900
-    available: false
-    inventory_quantity: 0
-    option1: beige
-    option2: 44
-    option3:
-  - &product-5-var-6
-    id: 14
-    title: white / 44
-    price: 13900
-    weight: 500
-    compare_at_price: 24900
-    available: false
-    inventory_quantity: 0
-    option1: white
-    option2: 44
-    option3:
-  - &product-6-var-1
-    id: 15
-    title: red
-    price: 2179500
-    weight: 200000
-    compare_at_price:
-    available: true
-    inventory_quantity: 0
-    option1: red
-    option2:
-    option3:
-  - &product-7-var-1
-    id: 16
-    title: black / small
-    price: 1900
-    weight: 200
-    compare_at_price:
-    available: true
-    inventory_quantity: 20
-    option1: black
-    option2: small
-    option3:
-  - &product-7-var-2
-    id: 17
-    title: black / medium
-    price: 1900
-    weight: 200
-    compare_at_price:
-    available: false
-    inventory_quantity: 0
-    option1: black
-    option2: medium
-    option3:
-  - &product-7-var-3
-    id: 18
-    title: black / large
-    price: 1900
-    weight: 200
-    compare_at_price:
-    available: true
-    inventory_quantity: 10
-    option1: black
-    option2: large
-    option3:
-  - &product-7-var-4
-    id: 19
-    title: black / extra large
-    price: 1900
-    weight: 200
-    compare_at_price:
-    available: false
-    inventory_quantity: 0
-    option1: black
-    option2: extra large
-    option3:
-  - &product-8-var-1
-    id: 20
-    title: brown / small
-    price: 5900
-    weight: 400
-    compare_at_price: 6900
-    available: true
-    inventory_quantity: 5
-    option1: brown
-    option2: small
-    option3:
-  - &product-8-var-2
-    id: 21
-    title: brown / medium
-    price: 5900
-    weight: 400
-    compare_at_price: 6900
-    available: false
-    inventory_quantity: 0
-    option1: brown
-    option2: medium
-    option3:
-  - &product-8-var-3
-    id: 22
-    title: brown / large
-    price: 5900
-    weight: 400
-    compare_at_price: 6900
-    available: true
-    inventory_quantity: 10
-    option1: brown
-    option2: large
-    option3:
-  - &product-8-var-4
-    id: 23
-    title: black / small
-    price: 5900
-    weight: 400
-    compare_at_price: 6900
-    available: true
-    inventory_quantity: 10
-    option1: black
-    option2: small
-    option3:
-  - &product-8-var-5
-    id: 24
-    title: black / medium
-    price: 5900
-    weight: 400
-    compare_at_price: 6900
-    available: true
-    inventory_quantity: 10
-    option1: black
-    option2: medium
-    option3:
-  - &product-8-var-6
-    id: 25
-    title: black / large
-    price: 5900
-    weight: 400
-    compare_at_price: 6900
-    available: false
-    inventory_quantity: 0
-    option1: black
-    option2: large
-    option3:
-  - &product-9-var-1
-    id: 26
-    title: Body Only
-    price: 499995
-    weight: 2000
-    compare_at_price:
-    available: true
-    inventory_quantity: 3
-    option1: Body Only
-    option2:
-    option3:
-  - &product-9-var-2
-    id: 27
-    title: Kit with 18-55mm VR lens
-    price: 523995
-    weight: 2000
-    compare_at_price:
-    available: true
-    inventory_quantity: 2
-    option1: Kit with 18-55mm VR lens
-    option2:
-    option3:
-  - &product-9-var-3
-    id: 28
-    title: Kit with 18-200 VR lens
-    price: 552500
-    weight: 2000
-    compare_at_price:
-    available: true
-    inventory_quantity: 3
-    option1: Kit with 18-200 VR lens
-    option2:
-    option3:
-
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#   Products
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-products:
-  - &product-1
-    id: 1
-    title: Arbor Draft
-    handle: arbor-draft
-    type: Snowboards
-    vendor: Arbor
-    price: 23900
-    price_max: 31900
-    price_min: 23900
-    price_varies: true
-    available: true
-    tags:
-      - season2005
-      - pro
-      - intermediate
-      - wooden
-      - freestyle
-    options:
-      - Length
-      - Style
-    compare_at_price: 49900
-    compare_at_price_max: 50900
-    compare_at_price_min: 49900
-    compare_at_price_varies: true
-    url: /products/arbor-draft
-    featured_image: products/arbor_draft.jpg
-    images:
-      - products/arbor_draft.jpg
-    description:
-      The Arbor Draft snowboard wouldn't exist if Polynesians hadn't figured out how to surf hundreds of years ago. But the Draft does exist, and it's here to bring your urban and park riding to a new level. The board's freaky Tiki design pays homage to culture that inspired snowboarding. It's designed to spin with ease, land smoothly, lock hook-free onto rails, and take the abuse of a pavement pounding or twelve. The Draft will pop off kickers with authority and carve solidly across the pipe. The Draft features targeted Koa wood die cuts inlayed into the deck that enhance the flex pattern. Now bow down to riding's ancestors.
-    variants:
-      - *product-1-var-1
-      - *product-1-var-2
-      - *product-1-var-3
-  - &product-2
-    id: 2
-    title: Arbor Element
-    handle: arbor-element
-    type: Snowboards
-    vendor: Arbor
-    price: 29900
-    price_max: 29900
-    price_min: 29900
-    price_varies: false
-    available: true
-    tags:
-      - season2005
-      - pro
-      - wooden
-      - freestyle
-    options:
-      - Length
-    compare_at_price: 52900
-    compare_at_price_max: 52900
-    compare_at_price_min: 52900
-    compare_at_price_varies: false
-    url: /products/arbor-element
-    featured_image: products/element58.jpg
-    images:
-      - products/element58.jpg
-    description:
-      The Element is a technically advanced all-mountain board for riders who readily transition from one terrain, snow condition, or riding style to another. Its balanced design provides the versatility needed for the true ride-it-all experience. The Element is exceedingly lively, freely initiates, and holds a tight edge at speed. Its structural real-wood topsheet is made with book-matched Koa.
-    variants:
-      - *product-2-var-1
-
-  - &product-3
-    id: 3
-    title: Comic ~ Pastel
-    handle: comic-pastel
-    type: Snowboards
-    vendor: Technine
-    price: 19900
-    price_max: 22900
-    price_min: 19900
-    tags:
-      - season2006
-      - beginner
-      - intermediate
-      - freestyle
-      - purple
-    options:
-      - Length
-    price_varies: true
-    available: true
-    compare_at_price:
-    compare_at_price_max: 0
-    compare_at_price_min: 0
-    compare_at_price_varies: false
-    url: /products/comic-pastel
-    featured_image: products/technine1.jpg
-    images:
-      - products/technine1.jpg
-      - products/technine2.jpg
-      - products/technine_detail.jpg
-    description:
-      2005 Technine Comic Series Description The Comic series was developed to be the ultimate progressive freestyle board in the Technine line. Dependable edge control and a perfect flex pattern for jumping in the park or out of bounds. Landins and progression will come easy with this board and it will help your riding progress to the next level. Street rails, park jibs, backcountry booters and park jumps, this board will do it all.
-    variants:
-      - *product-3-var-1
-      - *product-3-var-2
-      - *product-3-var-3
-
-  - &product-4
-    id: 4
-    title: Comic ~ Orange
-    handle: comic-orange
-    type: Snowboards
-    vendor: Technine
-    price: 19900
-    price_max: 19900
-    price_min: 19900
-    price_varies: false
-    available: true
-    tags:
-      - season2006
-      - beginner
-      - intermediate
-      - freestyle
-      - orange
-    options:
-      - Length
-    compare_at_price: 32900
-    compare_at_price_max: 32900
-    compare_at_price_min: 32900
-    compare_at_price_varies: false
-    url: /products/comic-orange
-    featured_image: products/technine3.jpg
-    images:
-      - products/technine3.jpg
-      - products/technine4.jpg
-    description:
-      2005 Technine Comic Series Description The Comic series was developed to be the ultimate progressive freestyle board in the Technine line. Dependable edge control and a perfect flex pattern for jumping in the park or out of bounds. Landins and progression will come easy with this board and it will help your riding progress to the next level. Street rails, park jibs, backcountry booters and park jumps, this board will do it all.
-    variants:
-      - *product-4-var-1
-
-  - &product-5
-    id: 5
-    title: Burton Boots
-    handle: burton-boots
-    type: Boots
-    vendor: Burton
-    price: 11900
-    price_max: 11900
-    price_min: 11900
-    price_varies: false
-    available: true
-    tags:
-      - season2006
-      - beginner
-      - intermediate
-      - boots
-    options:
-      - Color
-      - Shoe Size
-    compare_at_price: 22900
-    compare_at_price_max: 22900
-    compare_at_price_min: 22900
-    compare_at_price_varies: false
-    url: /products/burton-boots
-    featured_image: products/burton.jpg
-    images:
-      - products/burton.jpg
-    description:
-      The Burton boots are particularly well on snowboards. The very best thing about them is that the according picture is cubic. This makes testing in a Vision testing environment very easy.
-    variants:
-      - *product-5-var-1
-      - *product-5-var-2
-      - *product-5-var-3
-      - *product-5-var-4
-      - *product-5-var-5
-      - *product-5-var-6
-
-  - &product-6
-    id: 6
-    title: Superbike 1198 S
-    handle: superbike
-    type: Superbike
-    vendor: Ducati
-    price: 2179500
-    price_max: 2179500
-    price_min: 2179500
-    price_varies: false
-    available: true
-    tags:
-      - ducati
-      - superbike
-      - bike
-      - street
-      - racing
-      - performance
-    options:
-      - Color
-    compare_at_price:
-    compare_at_price_max: 0
-    compare_at_price_min: 0
-    compare_at_price_varies: false
-    url: /products/superbike
-    featured_image: products/ducati.jpg
-    images:
-      - products/ducati.jpg
-    description:
-      <h3>‘S’ PERFORMANCE</h3>
-      <p>Producing 170hp (125kW) and with a dry weight of just 169kg (372.6lb), the new 1198 S now incorporates more World Superbike technology than ever before by taking the 1198 motor and adding top-of-the-range suspension, lightweight chassis components and a true racing-style traction control system designed for road use.</p>
-      <p>The high performance, fully adjustable 43mm Öhlins forks, which sport low friction titanium nitride-treated fork sliders, respond effortlessly to every imperfection in the tarmac. Beyond their advanced engineering solutions, one of the most important characteristics of Öhlins forks is their ability to communicate the condition and quality of the tyre-to-road contact patch, a feature that puts every rider in superior control. The suspension set-up at the rear is complemented with a fully adjustable Öhlins rear shock equipped with a ride enhancing top-out spring and mounted to a single-sided swingarm for outstanding drive and traction. The front-to-rear Öhlins package is completed with a control-enhancing adjustable steering damper.</p>
-    variants:
-      - *product-6-var-1
-
-  - &product-7
-    id: 7
-    title: Shopify Shirt
-    handle: shopify-shirt
-    type: Shirt
-    vendor: Shopify
-    price: 1900
-    price_max: 1900
-    price_min: 1900
-    price_varies: false
-    available: true
-    tags:
-      - shopify
-      - shirt
-      - apparel
-      - tshirt
-      - clothing
-    options:
-      - Color
-      - Size
-    compare_at_price:
-    compare_at_price_max: 0
-    compare_at_price_min: 0
-    compare_at_price_varies: false
-    url: /products/shopify-shirt
-    featured_image: products/shopify_shirt.png
-    images:
-      - products/shopify_shirt.png
-    description:
-      <p>High Quality Shopify Shirt. Wear your e-commerce solution with pride and attract attention anywhere you go.</p>
-      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-    variants:
-      - *product-7-var-1
-      - *product-7-var-2
-      - *product-7-var-3
-      - *product-7-var-4
-
-  - &product-8
-    id: 8
-    title: Hooded Sweater
-    handle: hooded-sweater
-    type: Sweater
-    vendor: Stormtech
-    price: 5900
-    price_max: 5900
-    price_min: 5900
-    price_varies: false
-    available: true
-    tags:
-      - sweater
-      - hooded
-      - apparel
-      - clothing
-    options:
-      - Color
-      - Size
-    compare_at_price: 6900
-    compare_at_price_max: 6900
-    compare_at_price_min: 6900
-    compare_at_price_varies: false
-    url: /products/hooded-sweater
-    featured_image: products/hooded-sweater.jpg
-    images:
-      - products/hooded-sweater.jpg
-      - products/hooded-sweater-b.jpg
-    description:
-      <p>Extra comfortable zip up sweater. Durable quality, ideal for any outdoor activities.</p>
-      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-    variants:
-      - *product-8-var-1
-      - *product-8-var-2
-      - *product-8-var-3
-      - *product-8-var-4
-      - *product-8-var-5
-      - *product-8-var-6
-
-  - &product-9
-    id: 9
-    title: D3 Digital SLR Camera
-    handle: d3
-    type: SLR
-    vendor: Nikon
-    price: 499995
-    price_max: 552500
-    price_min: 499995
-    price_varies: true
-    available: true
-    tags:
-      - camera
-      - slr
-      - nikon
-      - professional
-    options:
-      - Bundle
-    compare_at_price:
-    compare_at_price_max: 0
-    compare_at_price_min: 0
-    compare_at_price_varies: false
-    url: /products/d3
-    featured_image: products/d3.jpg
-    images:
-      - products/d3.jpg
-      - products/d3_2.jpg
-      - products/d3_3.jpg
-    description:
-      <p>Flagship pro D-SLR with a 12.1-MP FX-format CMOS sensor, blazing 9 fps shooting at full FX resolution and low-noise performance up to 6400 ISO.</p>
-      <p><strong>Nikon's original 12.1-megapixel FX-format (23.9 x 36mm) CMOS sensor:</strong> Couple Nikon's exclusive digital image processing system with the 12.1-megapixel FX-format and you'll get breathtakingly rich images while also reducing noise to unprecedented levels with even higher ISOs.</p>
-      <p><strong>Continuous shooting at up to 9 frames per second:</strong> At full FX resolution and up to 11fps in the DX crop mode, the D3 offers uncompromised shooting speeds for fast-action and sports photography.</p>
-    variants:
-      - *product-9-var-1
-      - *product-9-var-2
-      - *product-9-var-3
-
-
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#   Line Items
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-line_items:
-  - &line_item-1
-    id: 1
-    title: 'Arbor Draft'
-    subtitle: '151cm'
-    price: 29900
-    line_price: 29900
-    quantity: 1
-    variant: *product-1-var-1
-    product: *product-1
-
-  - &line_item-2
-    id: 2
-    title: 'Comic ~ Orange'
-    subtitle: '159cm'
-    price: 19900
-    line_price: 39800
-    quantity: 2
-    variant: *product-4-var-1
-    product: *product-4
-
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#   Link Lists
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-links:
-  - &link-1
-    id: 1
-    title: Our Sale
-    url: /collections/sale
-  - &link-2
-    id: 2
-    title: Arbor Stuff
-    url: /collections/arbor
-  - &link-3
-    id: 3
-    title: All our Snowboards
-    url: /collections/snowboards
-  - &link-4
-    id: 4
-    title: Powered by Shopify
-    url: 'http://shopify.com'
-  - &link-5
-    id: 5
-    title: About Us
-    url: /pages/about-us
-  - &link-6
-    id: 6
-    title: Policies
-    url: /pages/shipping
-  - &link-7
-    id: 7
-    title: Contact Us
-    url: /pages/contact
-  - &link-8
-    id: 8
-    title: Our blog
-    url: /blogs/bigcheese-blog
-  - &link-9
-    id: 9
-    title: New Boots
-    url: /products/burton-boots
-  - &link-10
-    id: 10
-    title: Paginated Sale
-    url: /collections/paginated-sale
-  - &link-11
-    id: 11
-    title: Our Paginated blog
-    url: /blogs/paginated-blog
-  - &link-12
-    id: 12
-    title: Catalog
-    url: /collections/all
-
-
-
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#   Link Lists
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-link_lists:
-  - &link-list-1
-    id: 1
-    title: 'Main Menu'
-    handle: 'main-menu'
-    links:
-      - *link-12
-      - *link-5
-      - *link-7
-      - *link-8
-  - &link-list-2
-    id: 1
-    title: 'Footer Menu'
-    handle: 'footer'
-    links:
-      - *link-5
-      - *link-6
-
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#   Collections
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-collections:
-  - &collection-1
-    id: 1
-    title: Frontpage
-    handle: frontpage
-    url: /collections/frontpage
-    products:
-      - *product-7
-      - *product-8
-      - *product-9
-
-  - &collection-2
-    id: 2
-    title: Arbor
-    handle: arbor
-    url: /collections/arbor
-    products:
-      - *product-1
-      - *product-2
-
-  - &collection-3
-    id: 3
-    title: Snowboards
-    handle: snowboards
-    url: /collections/snowboards
-    description:
-      <p>This is a description for my <strong>Snowboards</strong> collection.</p>
-    products:
-      - *product-1
-      - *product-2
-      - *product-3
-      - *product-4
-
-  - &collection-4
-    id: 4
-    title: Items On Sale
-    handle: sale
-    url: /collections/sale
-    products:
-      - *product-1
-
-  - &collection-5
-    id: 5
-    title: Paginated Sale
-    handle: 'paginated-sale'
-    url: '/collections/paginated-sale'
-    products:
-      - *product-1
-      - *product-2
-      - *product-3
-      - *product-4
-    products_count: 210
-
-  - &collection-6
-    id: 6
-    title: All products
-    handle: 'all'
-    url: '/collections/all'
-    products:
-      - *product-7
-      - *product-8
-      - *product-9
-      - *product-6
-      - *product-1
-      - *product-2
-      - *product-3
-      - *product-4
-      - *product-5
-
-
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#   Pages and Blogs
-# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-pages:
-  - &page-2
-    id: 1
-    title: Contact Us
-    handle: contact
-    url: /pages/contact
-    author: Tobi
-    content:
-      "<p>You can contact us via phone under (555) 567-2222.</p>
-      <p>Our retail store is located at <em>Rue d'Avignon 32, Avignon (Provence)</em>.</p>
-      <p><strong>Opening Hours:</strong><br />Monday through Friday: 9am - 6pm<br />Saturday: 10am - 3pm<br />Sunday: closed</p>"
-    created_at: 2005-04-04 12:00
-
-  - &page-3
-    id: 2
-    title: About Us
-    handle: about-us
-    url: /pages/about-us
-    author: Tobi
-    content:
-      "<p>Our company was founded in 1894 and we are since operating out of Avignon from the beautiful Provence.</p>
-      <p>We offer the highest quality products and are proud to serve our customers to their heart's content.</p>"
-    created_at: 2005-04-04 12:00
-
-  - &page-4
-    id: 3
-    title: Shopping Cart
-    handle: shopping-cart
-    url: /pages/shopping-cart
-    author: Tobi
-    content: "<ul><li>Your order is safe with us. Our checkout uses industry standard security to protect your information.</li><li>Your order will be billed immediately upon checkout.</li><li><b>ALL SALES ARE FINAL:</b> Defective or damaged product will be exchanged</li><li>All orders are processed expediently: usually in under 24 hours.</li></ul>"
-    created_at: 2005-04-04 12:00
-
-  - &page-5
-    id: 4
-    title: Shipping and Handling
-    handle: shipping
-    url: /pages/shipping
-    author: Tobi
-    content: <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-    created_at: 2005-04-04 12:00
-
-  - &page-6
-    id: 5
-    title: Frontpage
-    handle: frontpage
-    url: /pages/frontpage
-    author: Tobi
-    content: <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-    created_at: 2005-04-04 12:00
-
-blogs:
-  - id: 1
-    handle: news
-    title: News
-    url: /blogs/news
-    articles:
-      - id: 3
-        title: 'Welcome to the new Foo Shop'
-        author: Daniel
-        content: <p><strong>Welcome to your Shopify store! The jaded Pixel crew is really glad you decided to take Shopify for a spin.</strong></p><p>To help you get you started with Shopify, here are a couple of tips regarding what you see on this page.</p><p>The text you see here is an article. To edit this article, create new articles or create new pages you can go to the <a href="/admin/pages">Blogs &amp; Pages</a> tab of the administration menu.</p><p>The Shopify t-shirt above is a product and selling products is what Shopify is all about. To edit this product, or create new products you can go to the <a href="/admin/products">Products Tab</a> in of the administration menu.</p><p>While you're looking around be sure to check out the <a href="/admin/collections">Collections</a> and <a href="/admin/links">Navigations</a> tabs and soon you will be well on your way to populating your site.</p><p>And of course don't forget to browse the <a href="admin/design/appearance/themes">theme gallery</a> to pick a new look for your shop!</p><p><strong>Shopify is in beta</strong><br />If you would like to make comments or suggestions please visit us in the <a href="http://forums.shopify.com/community">Shopify Forums</a> or drop us an <a href="mailto:feedback@shopify.com">email</a>.</p>
-        created_at: 2005-04-04 16:00
-      - id: 4
-        title: 'Breaking News: Restock on all sales products'
-        author: Tobi
-        content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-        created_at: 2005-04-04 12:00
-    articles_count: 2
-
-  - id: 2
-    handle: bigcheese-blog
-    title: Bigcheese blog
-    url: /blogs/bigcheese-blog
-    articles:
-      - id: 1
-        title: 'One thing you probably did not know yet...'
-        author: Justin
-        content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-        created_at: 2005-04-04 16:00
-        comments:
-          -
-            id: 1
-            author: John Smith
-            email: john@smith.com
-            content: Wow...great article man.
-            status: published
-            created_at: 2009-01-01 12:00
-            updated_at: 2009-02-01 12:00
-            url: ""
-          -
-            id: 2
-            author: John Jones
-            email: john@jones.com
-            content: I really enjoyed this article. And I love your shop! It's awesome. Shopify rocks!
-            status: published
-            created_at: 2009-03-01 12:00
-            updated_at: 2009-02-01 12:00
-            url: "http://somesite.com/"
-      - id: 2
-        title: Fascinating
-        author: Tobi
-        content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-        created_at: 2005-04-06 12:00
-        comments:
-    articles_count: 2
-    comments_enabled?: true
-    comment_post_url: ""
-    comments_count: 2
-    moderated?: true
-
-  - id: 3
-    handle: paginated-blog
-    title: Paginated blog
-    url: /blogs/paginated-blog
-    articles:
-      - id: 6
-        title: 'One thing you probably did not know yet...'
-        author: Justin
-        content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-        created_at: 2005-04-04 16:00
-
-      - id: 7
-        title: Fascinating
-        author: Tobi
-        content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-        created_at: 2005-04-06 12:00
-    articles_count: 200
diff --git a/performance/ThemeRunner.php b/performance/ThemeRunner.php
deleted file mode 100644
index 3895b4a..0000000
--- a/performance/ThemeRunner.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance;
-
-use Keepsuit\Liquid\Environment;
-use Keepsuit\Liquid\Performance\Shopify\Database;
-use Keepsuit\Liquid\Support\Arr;
-
-class ThemeRunner
-{
-    /**
-     * @var array<ThemeTestTemplate>
-     */
-    protected array $tests;
-
-    /**
-     * @var array<CompiledThemeTestTemplate>
-     */
-    protected array $compiledTemplates;
-
-    public function __construct(
-        protected Environment $environment
-    ) {
-        $files = glob(__DIR__.'/tests/**/*.liquid');
-
-        if ($files === false) {
-            throw new \RuntimeException('Could not find any tests');
-        }
-
-        $this->tests = Arr::compact(Arr::map($files, function (string $path) {
-            if (basename($path) === 'theme.liquid') {
-                return null;
-            }
-
-            $themePath = dirname($path).'/theme.liquid';
-
-            return new ThemeTestTemplate(
-                environment: $this->environment,
-                templateName: $path,
-                liquid: file_get_contents($path) ?: '',
-                layoutLiquid: file_exists($themePath) ? (file_get_contents($themePath) ?: '') : null,
-            );
-        }));
-
-        $this->compileAllTests();
-    }
-
-    public function tokenize(): void
-    {
-        foreach ($this->tests as $test) {
-            $this->environment->newParseContext()->tokenize($test->liquid);
-            if ($test->layoutLiquid !== null) {
-                $this->environment->newParseContext()->tokenize($test->layoutLiquid);
-            }
-        }
-    }
-
-    public function compile(): void
-    {
-        foreach ($this->tests as $test) {
-            $this->environment->parseString($test->liquid);
-            if ($test->layoutLiquid !== null) {
-                $this->environment->parseString($test->layoutLiquid);
-            }
-        }
-    }
-
-    public function render(): void
-    {
-        $database = [...Database::tables()];
-
-        foreach ($this->compiledTemplates as $compiled) {
-            $compiled->render($database);
-        }
-    }
-
-    public function stream(): void
-    {
-        $database = [...Database::tables()];
-
-        foreach ($this->compiledTemplates as $compiled) {
-            $compiled->stream($database);
-        }
-    }
-
-    public function run(): void
-    {
-        $database = [...Database::tables()];
-
-        foreach ($this->tests as $test) {
-            $compiled = $test->compile();
-            $compiled->render($database);
-        }
-    }
-
-    public function runStreaming(): void
-    {
-        $database = [...Database::tables()];
-
-        foreach ($this->tests as $test) {
-            $compiled = $test->compile();
-            $compiled->stream($database);
-        }
-    }
-
-    protected function compileAllTests(): void
-    {
-        $this->compiledTemplates = Arr::map($this->tests, fn (ThemeTestTemplate $template) => $template->compile());
-    }
-}
diff --git a/performance/ThemeTestTemplate.php b/performance/ThemeTestTemplate.php
deleted file mode 100644
index fcd9772..0000000
--- a/performance/ThemeTestTemplate.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance;
-
-use Keepsuit\Liquid\Environment;
-
-class ThemeTestTemplate
-{
-    public function __construct(
-        protected Environment $environment,
-        public string $templateName,
-        public string $liquid,
-        public ?string $layoutLiquid,
-    ) {}
-
-    public function pageTemplate(): string
-    {
-        return basename($this->templateName);
-    }
-
-    public function compile(): CompiledThemeTestTemplate
-    {
-        $template = $this->environment->parseString($this->liquid);
-        $layout = $this->layoutLiquid !== null ? $this->environment->parseString($this->layoutLiquid) : null;
-
-        return new CompiledThemeTestTemplate(
-            environment: $this->environment,
-            templateName: $this->templateName,
-            template: $template,
-            layout: $layout,
-        );
-    }
-}
diff --git a/performance/tests/dropify/article.liquid b/performance/tests/dropify/article.liquid
deleted file mode 100644
index dca6caa..0000000
--- a/performance/tests/dropify/article.liquid
+++ /dev/null
@@ -1,74 +0,0 @@
-<div class="article">
-  <h2 class="article-title">{{ article.title }}</h2>
-  <p class="article-details">posted <span class="article-time">{{ article.created_at | date: "%Y %h" }}</span> by <span class="article-author">{{ article.author }}</span></p>
-
-  <div class="article-body textile">
-    {{ article.content }}
-  </div>
-
-</div>
-
-<!-- Comments -->
-{% if blog.comments_enabled? %}
-<div id="comments">
-  <h3>Comments</h3>
-
-  <!-- List all comments -->
-  <ul id="comment-list">
-  {% for comment in article.comments %}
-    <li>
-      <div class="comment-details">
-        <span class="comment-author">{{ comment.author }}</span> said on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>:
-      </div>
-
-      <div class="comment">
-        {{ comment.content }}
-      </div>
-    </li>
-  {% endfor %}
-  </ul>
-
-  <!-- Comment Form -->
-  <div id="comment-form">
-  {% form article %}
-    <h3>Leave a comment</h3>
-
-    <!-- Check if a comment has been submitted in the last request, and if yes display an appropriate message -->
-    {% if form.posted_successfully? %}
-      {% if blog.moderated? %}
-        <div class="notice">
-          Successfully posted your comment.<br />
-          It will have to be approved by the blog owner first before showing up.
-        </div>
-      {% else %}
-        <div class="notice">Successfully posted your comment.</div>
-      {% endif %}
-    {% endif %}
-
-    {% if form.errors %}
-      <div class="notice error">Not all the fields have been filled out correctly!</div>
-    {% endif %}
-
-    <dl>
-      <dt class="{% if form.errors contains 'author' %}error{% endif %}"><label for="comment_author">Your name</label></dt>
-      <dd><input type="text" id="comment_author" name="comment[author]" size="40" value="{{form.author}}" class="{% if form.errors contains 'author' %}input-error{% endif %}" /></dd>
-
-      <dt class="{% if form.errors contains 'email' %}error{% endif %}"><label for="comment_email">Your email</label></dt>
-      <dd><input type="text" id="comment_email" name="comment[email]" size="40" value="{{form.email}}" class="{% if form.errors contains 'email' %}input-error{% endif %}" /></dd>
-
-      <dt class="{% if form.errors contains 'body' %}error{% endif %}"><label for="comment_body">Your comment</label></dt>
-      <dd><textarea id="comment_body" name="comment[body]" cols="40" rows="5" class="{% if form.errors contains 'body' %}input-error{% endif %}">{{form.body}}</textarea></dd>
-    </dl>
-
-    {% if blog.moderated? %}
-      <p class="hint">comments have to be approved before showing up</p>
-    {% endif %}
-
-    <input type="submit" value="Post comment" id="comment-submit" />
-  {% endform %}
-  </div>
-  <!-- END Comment Form -->
-
-</div>
-{% endif %}
-<!-- END Comments -->
diff --git a/performance/tests/dropify/blog.liquid b/performance/tests/dropify/blog.liquid
deleted file mode 100644
index 5a800c4..0000000
--- a/performance/tests/dropify/blog.liquid
+++ /dev/null
@@ -1,33 +0,0 @@
-<div id="page">
-  <h2>{{page.title}}</h2>
-
-  {% paginate blog.articles by 20 %}
-
-    {% for article in blog.articles  %}
-
-    <div class="article">
-      <div class="headline">
-      <h3 class="title">
-        <a href="{{article.url}}">{{ article.title }}</a>
-      </h3>
-      <h4 class="date">Posted on {{ article.created_at | date: "%B %d, '%y" }} by {{ article.author }}.</h4>
-      </div>
-
-      <div class="article-body textile">
-        {{ article.content | strip_html | truncate: 250 }}
-      </div>
-
-      {% if blog.comments_enabled? %}
-        <p style="text-align: right"><a href="{{article.url}}#comments">{{ article.comments_count }} comments</a></p>
-      {% endif %}
-    </div>
-
-    {% endfor %}
-
-    <div id="pagination">
-      {{ paginate | default_pagination }}
-    </div>
-
-  {% endpaginate %}
-
-</div>
diff --git a/performance/tests/dropify/cart.liquid b/performance/tests/dropify/cart.liquid
deleted file mode 100644
index 8fe26ab..0000000
--- a/performance/tests/dropify/cart.liquid
+++ /dev/null
@@ -1,66 +0,0 @@
-<script type="text/javascript">
-  function remove_item(id) {
-      document.getElementById('updates_'+id).value = 0;
-      document.getElementById('cartform').submit();
-  }
-</script>
-
-<div>
-
-  {% if cart.item_count == 0 %}
-    <h4>Your shopping cart is looking rather empty...</h4>
-  {% else %}
-  <form action="/cart" method="post" id="cartform">
-
-  <div id="cart">
-
-  <h3>You have {{ cart.item_count }} {{ cart.item_count | pluralize: 'product', 'products' }} in here!</h3>
-
-    <ul id="line-items">
-      {% for item in cart.items %}
-      <li id="item-{{item.id}}" class="clearfix">
-        <div class="thumb">
-          <div class="prodimage">
-          <a href="{{item.product.url}}" title="View {{item.title}} Page"><img src="{{item.product.featured_image | product_img_url: 'thumb' }}" alt="{{item.title | escape }}" /></a>
-        </div></div>
-        <h3 style="padding-right: 150px">
-      <a href="{{item.product.url}}" title="View {{item.title | escape }} Page">
-        {{ item.title }}
-        {% if item.variant.available == true %}
-           ({{item.variant.title}})
-        {% endif %}
-      </a>
-    </h3>
-        <small class="itemcost">Costs {{ item.price | money }} each, <span class="money">{{item.line_price | money }}</span> total.</small>
-        <p class="right">
-          <label for="updates">How many? </label>
-          <input type="text" size="4" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/><br />
-          <a href="#" onclick="remove_item({{item.variant.id}}); return false;" class="remove"><img style="padding:15px 0 0 0;margin:0;" src="{{ 'delete.gif' | asset_url }}" /></a>
-        </p>
-      </li>
-      {% endfor %}
-      <li id="total">
-        <input type="image" id="update-cart" name="update" value="Update My Cart" src="{{ 'update.gif' | asset_url }}" />
-        Subtotal:
-        <span class="money">{{ cart.total_price | money_with_currency }}</span>
-      </li>
-    </ul>
-
-  </div>
-
-    <div class="info">
-    <input type="image" value="Checkout!" name="checkout" src="{{ 'checkout.gif' | asset_url }}" />
-    </div>
-
-    {% if additional_checkout_buttons %}
-    <div class="additional-checkout-buttons">
-      <p>- or -</p>
-      {{ content_for_additional_checkout_buttons }}
-    </div>
-    {% endif %}
-
-  </form>
-
-  {% endif %}
-
-</div>
diff --git a/performance/tests/dropify/collection.liquid b/performance/tests/dropify/collection.liquid
deleted file mode 100644
index ad1427c..0000000
--- a/performance/tests/dropify/collection.liquid
+++ /dev/null
@@ -1,22 +0,0 @@
-{% paginate collection.products by 20 %}
-
-<ul id="product-collection">
-    {% for product in collection.products %}
-    <li class="singleproduct clearfix">
-      <div class="small">
-        <div class="prodimage"><a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" /></a></div>
-      </div>
-      <div class="description">
-        <h3><a href="{{product.url}}">{{product.title}}</a></h3>
-        <p>{{ product.description | strip_html | truncatewords: 35 }}</p>
-      <p class="money">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
-     </div>
-    </li>
-    {% endfor %}
-</ul>
-
-<div id="pagination">
-  {{ paginate | default_pagination }}
-</div>
-
-{% endpaginate %}
diff --git a/performance/tests/dropify/index.liquid b/performance/tests/dropify/index.liquid
deleted file mode 100644
index f1ea137..0000000
--- a/performance/tests/dropify/index.liquid
+++ /dev/null
@@ -1,47 +0,0 @@
-<div id="frontproducts"><div id="frontproducts-top"><div id="frontproducts-bottom">
-<h2 style="display: none;">Featured Items</h2>
-{% for product in collections.frontpage.products limit:1 offset:0 %}
-  <div class="productmain">
-   <a href="{{ product.url }}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
-   <h3><a href="{{ product.url }}">{{ product.title }}</a></h3>
-   <div class="description">{{ product.description | strip_html | truncatewords: 18 }}</div>
-  <p class="money">{{ product.price_min | money }}</p>
-  </div>
-{% endfor %}
-{% for product in collections.frontpage.products offset:1 %}
-  <div class="product">
-   <a href="{{ product.url }}"><img src="{{ product.featured_image | product_img_url: 'thumb' }}" alt="{{ product.title | escape }}" /></a>
-   <h3><a href="{{ product.url }}">{{ product.title }}</a></h3>
-     <p class="money">{{ product.price_min | money }}</p>
-  </div>
-{% endfor %}
-</div></div></div>
-
-<div id="mainarticle">
-  {% assign article = pages.frontpage %}
-
-  {% if article.content != "" %}
-    <h2>{{ article.title }}</h2>
-    <div class="article-body textile">
-      {{ article.content }}
-    </div>
-  {% else %}
-    <div class="article-body textile">
-    In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />
-    {{ "Learn more about handles" | link_to: "http://wiki.shopify.com/Handle" }}
-    </div>
-  {% endif %}
-
-</div>
-<br style="clear: both;" />
-<div id="articles">
-  {% for article in blogs.news.articles offset:1  %}
-    <div class="article">
-    <h2>{{ article.title }}</h2>
-    <div class="article-body textile">
-      {{ article.content }}
-    </div>
-  </div>
-  {% endfor %}
-</div>
-
diff --git a/performance/tests/dropify/page.liquid b/performance/tests/dropify/page.liquid
deleted file mode 100644
index 2ccbc63..0000000
--- a/performance/tests/dropify/page.liquid
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="page">
-  <h2>{{page.title}}</h2>
-
-  <div class="article textile">
-    {{page.content}}
-  </div>
-
-</div>
diff --git a/performance/tests/dropify/product.liquid b/performance/tests/dropify/product.liquid
deleted file mode 100644
index 8870389..0000000
--- a/performance/tests/dropify/product.liquid
+++ /dev/null
@@ -1,68 +0,0 @@
-<div id="productpage">
-
-  <div id="productimages"><div id="productimages-top"><div id="productimages-bottom">
-    {% for image in product.images %}
-      {% if forloop.first %}
-        <a href="{{ image | product_img_url: 'large' }}" class="productimage" rel="lightbox">
-          <img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
-        </a>
-      {% else %}
-        <a href="{{ image | product_img_url: 'large' }}" class="productimage-small" rel="lightbox">
-          <img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
-        </a>
-      {% endif %}
-    {% endfor %}
-  </div></div></div>
-
-  <h2>{{ product.title }}</h2>
-
-  <ul id="details" class="hlist">
-    <li>Vendor: {{ product.vendor | link_to_vendor }}</li>
-    <li>Type: {{ product.type | link_to_type }}</li>
-  </ul>
-
-  <small>{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</small>
-
-  <div id="variant-add">
-    <form action="/cart/add" method="post">
-
-      <select id="variant-select" name="id" class="product-info-options">
-        {% for variant in product.variants %}
-          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
-        {% endfor %}
-      </select>
-
-      <div id="price-field" class="price"></div>
-
-    <div style="text-align:center;"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'addtocart.gif' | asset_url }}" /></div>
-    </form>
-  </div>
-
-  <div class="description textile">
-    {{ product.description }}
-  </div>
-</div>
-
-<script type="text/javascript">
-<!--
-  // prototype callback for multi variants dropdown selector
-  var selectCallback = function(variant, selector) {
-    if (variant && variant.available == true) {
-      // selected a valid variant
-      $('add').removeClassName('disabled'); // remove unavailable class from add-to-cart button
-      $('add').disabled = false;           // reenable add-to-cart button
-      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
-    } else {
-      // variant doesn't exist
-      $('add').addClassName('disabled');      // set add-to-cart button to unavailable class
-      $('add').disabled = true;              // disable add-to-cart button
-      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
-    }
-  };
-
-  // initialize multi selector for product
-  Event.observe(document, 'dom:loaded', function() {
-    new Shopify.OptionSelectors("variant-select", { product: {{ product | json }}, onVariantSelected: selectCallback });
-  });
--->
-</script>
diff --git a/performance/tests/dropify/theme.liquid b/performance/tests/dropify/theme.liquid
deleted file mode 100644
index aca9206..0000000
--- a/performance/tests/dropify/theme.liquid
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <title>{{shop.name}} - {{page_title}}</title>
-
-  {{ 'textile.css'  | global_asset_url | stylesheet_tag }}
-  {{ 'lightbox/v204/lightbox.css' | global_asset_url | stylesheet_tag }}
-
-  {{ 'prototype/1.6/prototype.js' | global_asset_url  | script_tag }}
-  {{ 'scriptaculous/1.8.2/scriptaculous.js' | global_asset_url  | script_tag }}
-  {{ 'lightbox/v204/lightbox.js'  | global_asset_url  | script_tag }}
-  {{ 'option_selection.js'        | shopify_asset_url | script_tag }}
-
-  {{ 'layout.css'   | asset_url | stylesheet_tag }}
-  {{ 'shop.js'      | asset_url | script_tag }}
-
-  {{ content_for_header }}
-</head>
-
-<body id="page-{{template}}">
-
-  <p class="hide"><a href="#rightsiders">Skip to navigation.</a></p>
-    <!-- mini cart -->
-        {% if cart.item_count > 0 %}
-      <div id="minicart" style="display:none;"><div id="minicart-inner">
-      <div id="minicart-items">
-      <h2>There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in <a href="/cart" title="View your cart">your cart</a>!</h2><h4 style="font-size: 16px; margin: 0 0 10px 0; padding: 0;">Your subtotal is {{ cart.total_price | money }}.</h4>
-        {% for item in cart.items %}
-        <div class="thumb">
-          <div class="prodimage"><a href="{{item.product.url}}" onMouseover="tooltip('{{ item.quantity }} x {{ item.title }} ({{ item.variant.title }})', 200)"; onMouseout="hidetooltip()"><img src="{{ item.product.featured_image | product_img_url: 'thumb' }}" /></a></div>
-        </div>
-        {% endfor %}
-        </div>
-       <br style="clear:both;" />
-      </div></div>
-        {% endif %}
-
-  <div id="container">
-    <div id="header">
-      <!-- Begin Header -->
-        <h1 id="logo"><a href="/" title="Go Home">{{shop.name}}</a></h1>
-      <div id="cartlinks">
-        {% if cart.item_count > 0 %}
-          <h2 id="cartcount"><a href="/cart" onMouseover="tooltip('There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in your cart!', 200)"; onMouseout="hidetooltip()">{{ cart.item_count }} {{ cart.item_count | pluralize: 'thing', 'things' }}!</a></h2>
-      <a href="/cart" id="minicartswitch" onclick="superSwitch(this, 'minicart', 'Close Mini Cart'); return false;" id="cartswitch">View Mini Cart ({{ cart.total_price | money }})</a>
-        {% endif %}
-      </div>
-      <!-- End Header -->
-
-    </div>
-  <hr />
-<div id="main">
-
-    <div id="content">
-    <div id="innercontent">
-      {{ content_for_layout }}
-      </div>
-    </div>
-
-  <hr />
-    <div id="rightsiders">
-
-      <ul class="rightlinks">
-        {% for link in linklists.main-menu.links %}
-           <li>{{ link.title | link_to: link.url }}</li>
-        {% endfor %}
-      </ul>
-
-        {% if tags %}
-        <ul class="rightlinks">
-          {% for tag in collection.tags %}
-            <li><span class="add-link">{{ '+' | link_to_add_tag: tag }}</span>{{ tag | highlight_active_tag | link_to_tag: tag }}</li>
-          {% endfor %}
-        </ul>
-        {% endif %}
-
-      <ul class="rightlinks">
-        {% for link in linklists.footer.links %}
-           <li>{{ link.title | link_to: link.url }}</li>
-        {% endfor %}
-      </ul>
-
-    </div>
-
-  <hr /><br style="clear:both;" />
-
-    <div id="footer">
-      <div class="footerinner">
-      All prices are in {{ shop.currency }}.
-      Powered by <a href="http://www.shopify.com" title="Shopify, Hosted E-Commerce">Shopify</a>.
-    </div>
-    </div>
-
-  </div>
-</div>
-
-<div id="tooltip"></div>
-<img id="pointer" src="{{ 'arrow2.gif' | asset_url }}" />
-
-</body>
-</html>
-
diff --git a/performance/tests/ripen/article.liquid b/performance/tests/ripen/article.liquid
deleted file mode 100644
index e1b7e71..0000000
--- a/performance/tests/ripen/article.liquid
+++ /dev/null
@@ -1,74 +0,0 @@
-<div class="article">
-  <h2 class="article-title">{{ article.title }}</h2>
-  <p class="article-details">posted <span class="article-time">{{ article.created_at | date: "%Y %h" }}</span> by <span class="article-author">{{ article.author }}</span></p>
-
-  <div class="article-body textile">
-    {{ article.content }}
-  </div>
-
-</div>
-
-<!-- Comments -->
-{% if blog.comments_enabled? %}
-<div id="comments">
-  <h3>Comments</h3>
-
-  <!-- List all comments -->
-  <ul id="comment-list">
-  {% for comment in article.comments %}
-    <li>
-      <div class="comment">
-        {{ comment.content }}
-      </div>
-
-      <div class="comment-details">
-        Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
-      </div>
-    </li>
-  {% endfor %}
-  </ul>
-
-  <!-- Comment Form -->
-  <div id="comment-form">
-  {% form article %}
-    <h3>Leave a comment</h3>
-
-    <!-- Check if a comment has been submitted in the last request, and if yes display an appropriate message -->
-    {% if form.posted_successfully? %}
-      {% if blog.moderated? %}
-        <div class="notice">
-          Successfully posted your comment.<br />
-          It will have to be approved by the blog owner first before showing up.
-        </div>
-      {% else %}
-        <div class="notice">Successfully posted your comment.</div>
-      {% endif %}
-    {% endif %}
-
-    {% if form.errors %}
-      <div class="notice error">Not all the fields have been filled out correctly!</div>
-    {% endif %}
-
-    <dl>
-      <dt class="{% if form.errors contains 'author' %}error{% endif %}"><label for="comment_author">Your name</label></dt>
-      <dd><input type="text" id="comment_author" name="comment[author]" size="40" value="{{form.author}}" class="{% if form.errors contains 'author' %}input-error{% endif %}" /></dd>
-
-      <dt class="{% if form.errors contains 'email' %}error{% endif %}"><label for="comment_email">Your email</label></dt>
-      <dd><input type="text" id="comment_email" name="comment[email]" size="40" value="{{form.email}}" class="{% if form.errors contains 'email' %}input-error{% endif %}" /></dd>
-
-      <dt class="{% if form.errors contains 'body' %}error{% endif %}"><label for="comment_body">Your comment</label></dt>
-      <dd><textarea id="comment_body" name="comment[body]" cols="40" rows="5" class="{% if form.errors contains 'body' %}input-error{% endif %}">{{form.body}}</textarea></dd>
-    </dl>
-
-    {% if blog.moderated? %}
-      <p class="hint">comments have to be approved before showing up</p>
-    {% endif %}
-
-    <input type="submit" value="Post comment" id="comment-submit" />
-  {% endform %}
-  </div>
-  <!-- END Comment Form -->
-
-</div>
-{% endif %}
-<!-- END Comments -->
diff --git a/performance/tests/ripen/blog.liquid b/performance/tests/ripen/blog.liquid
deleted file mode 100644
index 91b71ba..0000000
--- a/performance/tests/ripen/blog.liquid
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="blog-page">
-  <h2 class="heading-shaded">{{page.title}}</h2>
-   {% for article in blog.articles  %}
-      <h4>
-        {{ article.created_at | date: '%d %b' }}
-        <a href="{{article.url}}">{{ article.title }}</a>
-      </h4>
-      {{ article.content }}
-      {% if blog.comments_enabled? %}
-        <p><a href="{{article.url}}#comments">{{ article.comments_count }} comments</a></p>
-      {% endif %}
-  {% endfor %}
-</div>
diff --git a/performance/tests/ripen/cart.liquid b/performance/tests/ripen/cart.liquid
deleted file mode 100644
index db7a221..0000000
--- a/performance/tests/ripen/cart.liquid
+++ /dev/null
@@ -1,54 +0,0 @@
-<script type="text/javascript">
-  function remove_item(id) {
-      document.getElementById('updates_'+id).value = 0;
-      document.getElementById('cart').submit();
-  }
-</script>
-
-<div id="cart-page">
-
-  {% if cart.item_count == 0 %}
-    <p>Your shopping cart is empty...</p>
-  <p><a href="/"><img src="{{ 'continue_shopping_icon.gif' | asset_url }}" alt="Continue shopping"/></a><p>
-  {% else %}
-
-  <form action="/cart" method="post" id="cart">
-
-  <table class="cart">
-      <tr>
-        <th colspan="2">Product</th>
-        <th class="short">Qty</th>
-        <th>Price</th>
-        <th>Total</th>
-        <th class="short">Remove</th>
-      </tr>
-
-      {% for item in cart.items %}
-      <tr class="{% cycle 'odd', 'even' %}">
-        <td class="short">{{ item.product.featured_image |  product_img_url: 'thumb' | img_tag }}</td>
-    <td><a href="{{item.product.url}}">{{ item.title }}</a></td>
-        <td class="short"><input type="text" class="quantity" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/></td>
-        <td class="cart-price">{{ item.price | money }}</td>
-        <td class="cart-price">{{item.line_price | money }}</td>
-        <td class="short"><a href="#" onclick="remove_item({{item.variant.id}}); return false;" class="remove"><img src="{{ 'cancel_icon.gif' | asset_url }}" alt="Remove" /></a></td>
-      </tr>
-      {% endfor %}
-    </table>
-    <p class="updatebtn"><input type="image" value="Update Cart" name="update" src="{{ 'update_icon.gif' | asset_url }}" alt="Update" /></p>
-    <p class="subtotal">
-    <strong>Subtotal:</strong> {{cart.total_price | money_with_currency }}
-    </p>
-    <p class="checkout"><input type="image" src="{{ 'checkout_icon.gif' | asset_url }}" alt="Proceed to Checkout" value="Proceed to Checkout" name="checkout"  /></p>
-
-    {% if additional_checkout_buttons %}
-    <div class="additional-checkout-buttons">
-      <p>- or -</p>
-      {{ content_for_additional_checkout_buttons }}
-    </div>
-    {% endif %}
-
-  </form>
-
-  {% endif %}
-
-</div>
diff --git a/performance/tests/ripen/collection.liquid b/performance/tests/ripen/collection.liquid
deleted file mode 100644
index 31151f3..0000000
--- a/performance/tests/ripen/collection.liquid
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="collection-page">
-
-{% if collection.description %}
-  <div id="collection-description" class="textile">{{ collection.description }}</div>
-{% endif %}
-
-{% paginate collection.products by 20 %}
-
-<ul id="product-collection">
-    {% for product in collection.products %}
-    <li class="single-product clearfix">
-      <div class="small">
-        <div class="prod-image"><a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a></div>
-      </div>
-      <div class="prod-list-description">
-        <h3><a href="{{product.url}}">{{product.title}}</a></h3>
-        <p>{{ product.description | strip_html | truncatewords: 35 }}</p>
-      <p class="prd-price">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
-     </div>
-    </li>
-    {% endfor %}
-</ul>
-
-<div id="pagination">
-  {{ paginate | default_pagination }}
-</div>
-
-{% endpaginate %}
-</div>
diff --git a/performance/tests/ripen/index.liquid b/performance/tests/ripen/index.liquid
deleted file mode 100644
index 0e8ad56..0000000
--- a/performance/tests/ripen/index.liquid
+++ /dev/null
@@ -1,32 +0,0 @@
-<div id="home-page">
-  <h3 class="heading-shaded">Featured products...</h3>
-  <div class="featured-prod-row clearfix">
-    {% for product in collections.frontpage.products %}
-      <div class="featured-prod-item">
-          <p>
-        <a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
-        </p>
-        <h4><a href="{{product.url}}">{{product.title}}</a></h4>
-        {% if product.compare_at_price %}
-          {% if product.price_min != product.compare_at_price %}
-            <p class="prd-price">Was:<del>{{product.compare_at_price | money}}</del></p>
-            <p class="prd-price"><ins>Now: {{product.price_min | money}}</ins></p>
-          {% endif %}
-        {% else %}
-          <p class="prd-price"><ins>{{product.price_min | money}}</ins></p>
-        {% endif %}
-      </div>
-    {% endfor %}
-  </div>
-
-  <div id="articles">
-    {% assign article = pages.frontpage %}
-    {% if article.content != "" %}
-      <h3>{{ article.title }}</h3>
-      {{ article.content }}
-    {% else %}
-      In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />
-      {{ "Learn more about handles" | link_to: "http://wiki.shopify.com/Handle" }}
-    {% endif %}
-  </div>
-</div>
diff --git a/performance/tests/ripen/page.liquid b/performance/tests/ripen/page.liquid
deleted file mode 100644
index b3e9702..0000000
--- a/performance/tests/ripen/page.liquid
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="single-page">
-<h2 class="heading-shaded">{{page.title}}</h2>
-  {{ page.content }}
-</div>
diff --git a/performance/tests/ripen/product.liquid b/performance/tests/ripen/product.liquid
deleted file mode 100644
index 9a97045..0000000
--- a/performance/tests/ripen/product.liquid
+++ /dev/null
@@ -1,75 +0,0 @@
-<div id="product-page">
-  <h2 class="heading-shaded">{{ product.title }}</h2>
-  <div id="product-details">
-  <div id="product-images">
-    {% for image in product.images %}
-      {% if forloop.first %}
-        <a href="{{ image | product_img_url: 'large' }}" class="product-image" rel="lightbox[ product]" title="">
-          <img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
-        </a>
-      {% else %}
-        <a href="{{ image | product_img_url: 'large' }}" class="product-image-small" rel="lightbox[ product]" title="">
-          <img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
-        </a>
-      {% endif %}
-    {% endfor %}
-  </div>
-
-  <ul id="product-info">
-    <li>Vendor: {{ product.vendor | link_to_vendor }}</li>
-    <li>Type: {{ product.type | link_to_type }}</li>
-    </ul>
-
-    <small>{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</small>
-
-    <div id="product-options">
-              {% if product.available %}
-
-    <form action="/cart/add" method="post">
-
-      <select id="product-select" name='id'>
-        {% for variant in product.variants %}
-          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
-        {% endfor %}
-      </select>
-
-      <div id="price-field"></div>
-
-      <div class="add-to-cart"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'add-to-cart.gif' | asset_url }}" /></div>
-    </form>
-              {% else %}
-                  <span>Sold Out!</span>
-              {% endif %}
-    </div>
-
-    <div class="product-description">
-    {{ product.description }}
-    </div>
-  </div>
-</div>
-
-
-<script type="text/javascript">
-<!--
-  // mootools callback for multi variants dropdown selector
-  var selectCallback = function(variant, selector) {
-    if (variant && variant.available == true) {
-      // selected a valid variant
-      $('add').removeClass('disabled'); // remove unavailable class from add-to-cart button
-      $('add').disabled = false;           // reenable add-to-cart button
-      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
-    } else {
-      // variant doesn't exist
-      $('add').addClass('disabled');      // set add-to-cart button to unavailable class
-      $('add').disabled = true;              // disable add-to-cart button
-      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
-    }
-  };
-
-  // initialize multi selector for product
-  window.addEvent('domready', function() {
-    new Shopify.OptionSelectors("product-select", { product: {{ product | json }}, onVariantSelected: selectCallback });
-  });
--->
-</script>
-
diff --git a/performance/tests/ripen/theme.liquid b/performance/tests/ripen/theme.liquid
deleted file mode 100644
index 72c2992..0000000
--- a/performance/tests/ripen/theme.liquid
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-<head>
-  <title>{{shop.name}} - {{page_title}}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-  {{ 'main.css'     | asset_url | stylesheet_tag }}
-  {{ 'shop.js'      | asset_url | script_tag }}
-
-  {{ 'mootools.js'         | asset_url         | script_tag }}
-  {{ 'slimbox.js'          | asset_url         | script_tag }}
-  {{ 'option_selection.js' | shopify_asset_url | script_tag }}
-  {{ 'slimbox.css'         | asset_url         | stylesheet_tag }}
-
-  {{ content_for_header }}
- </head>
-
-<body id="page-{{template}}">
-<p class="hide"><a href="#navigation">Skip to navigation.</a></p>
-<div id="wrapper">
-  <div class="content clearfix">
-    <div id="header">
-      <h2><a href="/">{{shop.name}}</a></h2>
-    </div>
-    <div id="left-col">
-      {{ content_for_layout }}
-    </div>
-    <div id="right-col">
-      {% if template != 'cart' %}
-          <div id="cart-right-col">
-          <dl id="cart-right-col-info">
-            <dt>Shopping Cart</dt>
-            <dd>
-            {% if cart.item_count != 0 %}
-              <a href="/cart">{{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}</a> in your cart
-            {% else %}
-              Your cart is empty
-            {% endif %}
-            </dd>
-          </dl>
-        </div>
-      {% endif %}
-      <div id="search">
-        <dl id="searchbox">
-        <dt>Search</dt>
-        <dd>
-        <form action="/search" method="get">
-        <fieldset>
-        <input class="search-input" type="text" onclick="this.select()" value="Search this shop..." name="q" />
-        </fieldset>
-        </form>
-        </dd>
-        </dl>
-      </div>
-      <div id="navigation">
-        <dl class="navbar">
-        <dt>Navigation</dt>
-        {% for link in linklists.main-menu.links %}
-          <dd>{{ link.title | link_to: link.url }}</dd>
-        {% endfor %}
-        </dl>
-
-        {% if tags %}
-        <dl class="navbar">
-        <dt>Tags</dt>
-          {% for tag in collection.tags %}
-          <dd>{{ tag | highlight_active_tag | link_to_tag: tag }}</dd>
-          {% endfor %}
-          </dl>
-        {% endif %}
-      </div>
-    </div>
-
-  </div>
-    <div id="content-padding"></div>
-</div>
-
-<div id="footer">
-  {% for link in linklists.footer.links %}
-  {{ link.title | link_to: link.url }} {% if forloop.rindex != 1 %} | {% endif %}
-  {% endfor %}
-</div>
-
-</body>
-</html>
diff --git a/performance/tests/tribble/404.liquid b/performance/tests/tribble/404.liquid
deleted file mode 100644
index acf184c..0000000
--- a/performance/tests/tribble/404.liquid
+++ /dev/null
@@ -1,56 +0,0 @@
-  <div id="page" class="innerpage clearfix">
-
-    <div id="text-page">
-      <div class="entry">
-        <h1>Oh no!</h1>
-        <div class="entry-post">
-          Seems like you are looking for something that just isn't here. <a href="/">Try heading back to our main page</a>. Or you can checkout some of our featured products below.
-        </div>
-      </div>
-    </div>
-
-
-    <h1>Featured Products</h1>
-    <ul class="item-list clearfix">
-
-      {% for product in collections.frontpage.products %}
-      <li>
-        <form action="/cart/add" method="post">
-        <div class="item-list-item">
-          <div class="ili-top clearfix">
-            <div class="ili-top-content">
-              <h2><a href="{{product.url}}">{{product.title}}</a></h2>
-              <p>{{ product.description | truncatewords: 15 }}</p>
-            </div>
-            <a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
-          </div>
-
-          <div class="ili-bottom clearfix">
-            <p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
-            <input type="submit" class="" value="Add to Basket" />
-            <p>
-              <a href="{{product.url}}">View Details</a>
-
-              <span>
-                {% if product.compare_at_price %}
-                  {% if product.price_min != product.compare_at_price %}
-                    {{product.compare_at_price | money}} -
-                    {% endif %}
-                {% endif %}
-                <strong>
-                  {{product.price_min | money}}
-                </strong>
-              </span>
-            </p>
-          </div>
-        </div>
-        </form>
-      </li>
-      {% endfor %}
-
-    </ul>
-  </div>
-  <!-- end page -->
-
-
-
diff --git a/performance/tests/tribble/article.liquid b/performance/tests/tribble/article.liquid
deleted file mode 100644
index cb2453a..0000000
--- a/performance/tests/tribble/article.liquid
+++ /dev/null
@@ -1,98 +0,0 @@
-
-  <div id="page" class="innerpage clearfix">
-    <div id="text-page">
-
-          <div class="entry">
-            <h1><span>{{article.title}}</span></h1>
-            <div class="entry-post">
-              <div class="meta">{{ article.created_at | date: "%b %d" }}</div>
-              {{ article.content }}
-            </div>
-
-  <!-- Comments -->
-{% if blog.comments_enabled? %}
-<div id="comments">
-  <h2>Comments</h2>
-
-  <!-- List all comments -->
-  <ul id="comment-list">
-  {% for comment in article.comments %}
-    <li>
-      <div class="comment">
-        {{ comment.content }}
-      </div>
-
-      <div class="comment-details">
-        Posted by <span class="comment-author">{{ comment.author }}</span> on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>
-      </div>
-    </li>
-  {% endfor %}
-  </ul>
-
-  <!-- Comment Form -->
-  <div id="comment-form">
-  {% form article %}
-    <h2>Leave a comment</h2>
-
-    <!-- Check if a comment has been submitted in the last request, and if yes display an appropriate message -->
-    {% if form.posted_successfully? %}
-      {% if blog.moderated? %}
-        <div class="notice">
-          Successfully posted your comment.<br />
-          It will have to be approved by the blog owner first before showing up.
-        </div>
-      {% else %}
-        <div class="notice">Successfully posted your comment.</div>
-      {% endif %}
-    {% endif %}
-
-    {% if form.errors %}
-      <div class="notice error">Not all the fields have been filled out correctly!</div>
-    {% endif %}
-
-    <dl>
-      <dt class="{% if form.errors contains 'author' %}error{% endif %}"><label for="comment_author">Your name</label></dt>
-      <dd><input type="text" id="comment_author" name="comment[author]" size="40" value="{{form.author}}" class="{% if form.errors contains 'author' %}input-error{% endif %}" /></dd>
-
-      <dt class="{% if form.errors contains 'email' %}error{% endif %}"><label for="comment_email">Your email</label></dt>
-      <dd><input type="text" id="comment_email" name="comment[email]" size="40" value="{{form.email}}" class="{% if form.errors contains 'email' %}input-error{% endif %}" /></dd>
-
-      <dt class="{% if form.errors contains 'body' %}error{% endif %}"><label for="comment_body">Your comment</label></dt>
-      <dd><textarea id="comment_body" name="comment[body]" cols="40" rows="5" class="{% if form.errors contains 'body' %}input-error{% endif %}">{{form.body}}</textarea></dd>
-    </dl>
-
-    {% if blog.moderated? %}
-      <p class="hint">comments have to be approved before showing up</p>
-    {% endif %}
-
-    <input type="submit" value="Post comment" id="comment-submit" />
-  {% endform %}
-  </div>
-  <!-- END Comment Form -->
-
-</div>
-{% endif %}
-<!-- END Comments -->
-
-
-          </div>
-    </div>
-
-    <div id="three-reasons" class="clearfix">
-      <h3>Why Shop With Us?</h3>
-      <ul>
-        <li class="two-a">
-          <h4>24 Hours</h4>
-          <p>We're always here to help.</p>
-        </li>
-        <li class="two-c">
-          <h4>No Spam</h4>
-          <p>We'll never share your info.</p>
-        </li>
-        <li class="two-d">
-          <h4>Secure Servers</h4>
-          <p>Checkout is 256bit encrypted.</p>
-        </li>
-      </ul>
-    </div>
-  </div>
diff --git a/performance/tests/tribble/blog.liquid b/performance/tests/tribble/blog.liquid
deleted file mode 100644
index ba9f52a..0000000
--- a/performance/tests/tribble/blog.liquid
+++ /dev/null
@@ -1,41 +0,0 @@
-  <div id="page" class="innerpage clearfix">
-    <div id="text-page">
-      <h1>Post from our blog...</h1>
-      {% paginate blog.articles by 20 %}
-          {% for article in blog.articles  %}
-
-          <div class="entry">
-            <h1><span><a href="{{ article.url }}">{{ article.title }}</a></span></h1>
-            <div class="entry-post">
-              <div class="meta">{{ article.created_at | date: "%b %d" }}</div>
-              {{ article.content }}
-            </div>
-          </div>
-
-        {% endfor %}
-
-        <div class="paginate clearfix">
-            {{ paginate | default_pagination }}
-        </div>
-
-      {% endpaginate %}
-    </div>
-
-    <div id="three-reasons" class="clearfix">
-      <h3>Why Shop With Us?</h3>
-      <ul>
-        <li class="two-a">
-          <h4>24 Hours</h4>
-          <p>We're always here to help.</p>
-        </li>
-        <li class="two-c">
-          <h4>No Spam</h4>
-          <p>We'll never share your info.</p>
-        </li>
-        <li class="two-d">
-          <h4>Secure Servers</h4>
-          <p>Checkout is 256bit encrypted.</p>
-        </li>
-      </ul>
-    </div>
-  </div>
diff --git a/performance/tests/tribble/cart.liquid b/performance/tests/tribble/cart.liquid
deleted file mode 100644
index bdc5e83..0000000
--- a/performance/tests/tribble/cart.liquid
+++ /dev/null
@@ -1,134 +0,0 @@
-<script type="text/javascript">
-  function remove_item(id) {
-      document.getElementById('updates_'+id).value = 0;
-      document.getElementById('cart').submit();
-  }
-</script>
-
-  <div id="page" class="innerpage clearfix">.
-    {% if cart.item_count == 0 %}
-         <h1>Your cart is currently empty.</h1>
-      {% else %}
-
-    <h1>Your Cart <span>({{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}, {{cart.total_price | money_with_currency }} total)</span></h1>
-
-    <form action="/cart" method="post" id="cart-form">
-
-    <div id="cart-wrap">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <th scope="col" class="td-image"><label>Image</label></th>
-          <th scope="col" class="td-title"><label>Product Title</label></th>
-          <th scope="col" class="td-count"><label>Count</label></th>
-          <th scope="col" class="td-price"><label>Cost</label></th>
-          <th scope="col" class="td-delete"><label>Remove</label></th>
-        </tr>
-
-        {% for item in cart.items %}
-        <tr class="{% cycle 'reg', 'alt' %}">
-          <td colspan="5">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td class="td-image"><a href="{{item.product.url}}">{{ item.product.featured_image |  product_img_url: 'thumb' | img_tag }}</a></td>
-                <td class="td-title"><p>{{ item.title }}</p></td>
-                <td class="td-count"><label>Count:</label> <input type="text" class="quantity item-count" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/></td>
-                <td class="td-price">{{item.line_price | money }}</td>
-                <td class="td-delete"><a href="#" onclick="remove_item({{item.variant.id}}); return false;">Remove</a></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        {% endfor %}
-      </table>
-
-      <div id="finish-up">
-
-        <div class="latest-news-box">
-          {{ pages.shopping-cart.content }}
-        </div>
-
-        <p class="order-total">
-          <span><strong>Order Total:</strong> {{cart.total_price | money_with_currency }}</span>
-        </p>
-
-        <p class="update-cart"><input type="submit" value="Refresh Cart" name="update" /></p>
-
-          <p class="go-checkout"><input type="submit" value="Proceed to Checkout" name="checkout"  /></p>
-
-        {% if additional_checkout_buttons %}
-        <div class="additional-checkout-buttons">
-          <p>- or -</p>
-          {{ content_for_additional_checkout_buttons }}
-        </div>
-        {% endif %}
-
-      </div>
-
-    </div>
-
-    </form>
-
-    {% endif %}
-
-
-
-    <h1 class="other-products"><span>Other Products You Might Enjoy</span></h1>
-    <ul class="item-list clearfix">
-
-      {% for product in collections.frontpage.products limit:2 %}
-      <li>
-        <form action="/cart/add" method="post">
-        <div class="item-list-item">
-          <div class="ili-top clearfix">
-            <div class="ili-top-content">
-              <h2><a href="{{product.url}}">{{product.title}}</a></h2>
-              <p>{{ product.description | truncatewords: 15 }}</p>
-            </div>
-            <a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
-          </div>
-
-          <div class="ili-bottom clearfix">
-            <p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
-            <input type="submit" class="" value="Add to Basket" />
-            <p>
-              <a href="{{product.url}}">View Details</a>
-
-              <span>
-                {% if product.compare_at_price %}
-                  {% if product.price_min != product.compare_at_price %}
-                    {{product.compare_at_price | money}} -
-                    {% endif %}
-                {% endif %}
-                <strong>
-                  {{product.price_min | money}}
-                </strong>
-              </span>
-            </p>
-          </div>
-        </div>
-        </form>
-      </li>
-      {% endfor %}
-
-    </ul>
-
-    <div id="three-reasons" class="clearfix">
-      <h3>Why Shop With Us?</h3>
-      <ul>
-        <li class="two-a">
-          <h4>24 Hours</h4>
-          <p>We're always here to help.</p>
-        </li>
-        <li class="two-c">
-          <h4>No Spam</h4>
-          <p>We'll never share your info.</p>
-        </li>
-        <li class="two-d">
-          <h4>Secure Servers</h4>
-          <p>Checkout is 256bit encrypted.</p>
-        </li>
-      </ul>
-    </div>
-
-  </div>
-  <!-- end page -->
diff --git a/performance/tests/tribble/collection.liquid b/performance/tests/tribble/collection.liquid
deleted file mode 100644
index fd2fd01..0000000
--- a/performance/tests/tribble/collection.liquid
+++ /dev/null
@@ -1,70 +0,0 @@
-  <div id="page" class="innerpage clearfix">
-    <h1>{{ collection.title }}</h1>
-    {% if collection.description.size > 0 %}
-      <div class="latest-news">{{ collection.description }}</div>
-    {% endif %}
-
-    {% paginate collection.products by 8 %}
-
-    <ul class="item-list clearfix">
-    {% for product in collection.products  %}
-      <li>
-        <form action="/cart/add" method="post">
-        <div class="item-list-item">
-          <div class="ili-top clearfix">
-            <div class="ili-top-content">
-              <h2><a href="{{product.url}}">{{product.title}}</a></h2>
-              <p>{{ product.description | truncatewords: 15 }}</p>
-            </div>
-            <a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
-          </div>
-
-          <div class="ili-bottom clearfix">
-            <p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
-            <input type="submit" class="" value="Add to Basket" />
-            <p>
-              <a href="{{product.url}}">View Details</a>
-
-              <span>
-                {% if product.compare_at_price %}
-                  {% if product.price_min != product.compare_at_price %}
-                    {{product.compare_at_price | money}} -
-                    {% endif %}
-                {% endif %}
-                <strong>
-                  {{product.price_min | money}}
-                </strong>
-              </span>
-            </p>
-          </div>
-        </div>
-        </form>
-      </li>
-    {% endfor %}
-    </ul>
-
-    <div class="paginate clearfix">
-      {{ paginate | default_pagination }}
-    </div>
-
-
-    <div id="three-reasons" class="clearfix">
-      <h3>Why Shop With Us?</h3>
-      <ul>
-        <li class="two-a">
-          <h4>24 Hours</h4>
-          <p>We're always here to help.</p>
-        </li>
-        <li class="two-c">
-          <h4>No Spam</h4>
-          <p>We'll never share your info.</p>
-        </li>
-        <li class="two-d">
-          <h4>Secure Servers</h4>
-          <p>Checkout is 256bit encrypted.</p>
-        </li>
-      </ul>
-    </div>
-  </div>
-
-{% endpaginate %}
diff --git a/performance/tests/tribble/index.liquid b/performance/tests/tribble/index.liquid
deleted file mode 100644
index 551cf7c..0000000
--- a/performance/tests/tribble/index.liquid
+++ /dev/null
@@ -1,94 +0,0 @@
-  <div id="gwrap">
-    <div id="gbox">
-      <h1>Three Great Reasons You Should Shop With Us...</h1>
-      <ul>
-        <li class="gbox1">
-          <h2>Free Shipping</h2>
-          <p>On all orders over $25</p>
-        </li>
-        <li class="gbox2">
-          <h2>Top Quality</h2>
-          <p>Hand made in our shop</p>
-        </li>
-        <li class="gbox3">
-          <h2>100% Guarantee</h2>
-          <p>Any time, any reason</p>
-        </li>
-      </ul>
-    </div>
-  </div>
-
-  <div id="page" class="clearfix">
-
-    <div class="latest-news">{{pages.alert.content}}</div>
-
-    <ul class="item-list clearfix">
-
-      {% for product in collections.frontpage.products %}
-      <li>
-        <form action="/cart/add" method="post">
-        <div class="item-list-item">
-          <div class="ili-top clearfix">
-            <div class="ili-top-content">
-              <h2><a href="{{product.url}}">{{product.title}}</a></h2>
-              {{ product.description | truncatewords: 15 }}</p> <!-- extra cloding <p> tag for truncation -->
-            </div>
-            <a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
-          </div>
-
-          <div class="ili-bottom clearfix">
-            <p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
-            <input type="submit" class="" value="Add to Basket" />
-            <p>
-              <a href="{{product.url}}">View Details</a>
-
-              <span>
-                {% if product.compare_at_price %}
-                  {% if product.price_min != product.compare_at_price %}
-                    {{product.compare_at_price | money}} -
-                    {% endif %}
-                {% endif %}
-                <strong>
-                  {{product.price_min | money}}
-                </strong>
-              </span>
-            </p>
-          </div>
-        </div>
-        </form>
-      </li>
-      {% endfor %}
-
-    </ul>
-
-    <div id="one-two">
-      <div id="two">
-        <h3>Why Shop With Us?</h3>
-        <ul>
-          <li class="two-a">
-            <h4>24 Hours</h4>
-            <p>We're always here to help.</p>
-          </li>
-          <li class="two-c">
-            <h4>No Spam</h4>
-            <p>We'll never share your info.</p>
-          </li>
-          <li class="two-b">
-            <h4>Save Energy</h4>
-            <p>We're green, all the way.</p>
-          </li>
-          <li class="two-d">
-            <h4>Secure Servers</h4>
-            <p>Checkout is 256bits encrypted.</p>
-          </li>
-        </ul>
-      </div>
-
-      <div id="one">
-        <h3>Our Company</h3>
-        {{pages.about-us.content | truncatewords: 49}} <a href="/pages/about-us">read more</a></p>
-      </div>
-    </div>
-
-  </div>
-  <!-- end page -->
diff --git a/performance/tests/tribble/page.liquid b/performance/tests/tribble/page.liquid
deleted file mode 100644
index fa01097..0000000
--- a/performance/tests/tribble/page.liquid
+++ /dev/null
@@ -1,56 +0,0 @@
-  <div id="page" class="innerpage clearfix">
-
-    <div id="text-page">
-      <div class="entry">
-        <h1>{{page.title}}</h1>
-        <div class="entry-post">
-          {{page.content}}
-        </div>
-      </div>
-    </div>
-
-
-    <h1>Featured Products</h1>
-    <ul class="item-list clearfix">
-
-      {% for product in collections.frontpage.products %}
-      <li>
-        <form action="/cart/add" method="post">
-        <div class="item-list-item">
-          <div class="ili-top clearfix">
-            <div class="ili-top-content">
-              <h2><a href="{{product.url}}">{{product.title}}</a></h2>
-              <p>{{ product.description | truncatewords: 15 }}</p>
-            </div>
-            <a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
-          </div>
-
-          <div class="ili-bottom clearfix">
-            <p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
-            <input type="submit" class="" value="Add to Basket" />
-            <p>
-              <a href="{{product.url}}">View Details</a>
-
-              <span>
-                {% if product.compare_at_price %}
-                  {% if product.price_min != product.compare_at_price %}
-                    {{product.compare_at_price | money}} -
-                    {% endif %}
-                {% endif %}
-                <strong>
-                  {{product.price_min | money}}
-                </strong>
-              </span>
-            </p>
-          </div>
-        </div>
-        </form>
-      </li>
-      {% endfor %}
-
-    </ul>
-  </div>
-  <!-- end page -->
-
-
-
diff --git a/performance/tests/tribble/product.liquid b/performance/tests/tribble/product.liquid
deleted file mode 100644
index f0a1bf6..0000000
--- a/performance/tests/tribble/product.liquid
+++ /dev/null
@@ -1,116 +0,0 @@
-<div id="page" class="innerpage clearfix">
-  <h1>{{ collection.title }} {{ product.title }}</h1>
-
-
-  <p class="latest-news"><strong>Product Tags: </strong>
-    {% for tag in product.tags %}
-            <a href="/collections/all/{{ tag }}">{{ tag }}</a> |
-          {% endfor %}
-  </p>
-
-  <div class="product clearfix">
-    <div class="product-info">
-      <h1>{{ product.title }}</h1>
-      <div class="product-info-description">
-        <p>{{ product.description }}  </p>
-      </div>
-
-      {% if product.available %}
-      <form action="/cart/add" method="post">
-
-      <h2>Product Options:</h2>
-
-      <select id="product-info-options" name="id" class="product-info-options">
-        {% for variant in product.variants %}
-          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
-        {% endfor %}
-      </select>
-
-      <div id="price-field"></div>
-
-      <div class="product-purchase-btn">
-        <input type="submit" class="add-this-to-cart" id="add-this-to-cart" value="Add to Basket" />
-      </div>
-
-      </form>
-      {% else %}
-              <h2>Sold out!</h2>
-              <p>Sorry, we're all out of this product. Check back often and order when it returns</p>
-              {% endif %}
-    </div>
-
-    <div class="product-images clearfix">
-      {% for image in product.images %}
-
-      {% if forloop.first %}
-      <div class="product-image-large">
-        <img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
-      </div>
-      {% else %}
-      {% endif %}
-      {% endfor %}
-
-      <ul class="product-thumbs clearfix">
-      {% for image in product.images %}
-      {% if forloop.first %}
-      {% else %}
-
-      <li>
-      <a href="{{ image | product_img_url: 'large' }}" class="product-thumbs" rel="lightbox[product]" title="">
-        <img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
-      </a>
-      </li>
-      {% endif %}
-      {% endfor %}
-      </ul>
-    </div>
-  </div>
-
-
-
-  <div id="three-reasons" class="clearfix">
-    <h3>Why Shop With Us?</h3>
-    <ul>
-      <li class="two-a">
-        <h4>24 Hours</h4>
-        <p>We're always here to help.</p>
-      </li>
-      <li class="two-c">
-        <h4>No Spam</h4>
-        <p>We'll never share your info.</p>
-      </li>
-      <li class="two-d">
-        <h4>Secure Servers</h4>
-        <p>Checkout is 256bit encrypted.</p>
-      </li>
-    </ul>
-  </div>
-
-</div>
-<!-- end page -->
-
-<script type="text/javascript">
-<!--
-  // prototype callback for multi variants dropdown selector
-  var selectCallback = function(variant, selector) {
-    if (variant && variant.available == true) {
-      // selected a valid variant
-      $('add-this-to-cart').removeClassName('disabled'); // remove unavailable class from add-to-cart button
-      $('add-this-to-cart').disabled = false;           // reenable add-to-cart button
-      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
-    } else {
-      // variant doesn't exist
-      $('add-this-to-cart').addClassName('disabled');      // set add-to-cart button to unavailable class
-      $('add-this-to-cart').disabled = true;              // disable add-to-cart button
-      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
-    }
-  };
-
-  // initialize multi selector for product
-  Event.observe(document, 'dom:loaded', function() {
-    new Shopify.OptionSelectors("product-info-options", { product: {{ product | json }}, onVariantSelected: selectCallback });
-  });
--->
-</script>
-
-
diff --git a/performance/tests/tribble/search.liquid b/performance/tests/tribble/search.liquid
deleted file mode 100644
index f509c74..0000000
--- a/performance/tests/tribble/search.liquid
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-    <div id="page" class="innerpage clearfix">
-    <h1>Search Results</h1>
-    {% if search.performed %}
-
-     {% paginate search.results by 10 %}
-
-     {% if search.results == empty %}
-      <div class="latest-news">Your search for "{{search.terms | escape}}" did not yield any results</div>
-        {% else %}
-
-
-    <ul class="search-list clearfix">
-     {% for item in search.results %}
-      <li>
-          <h3 class="stitle">{{ item.title | link_to: item.url }}</h3>
-          <p class="sinfo">{{ item.content | strip_html | truncatewords: 65 | highlight: search.terms }} ... <a href="{{item.url}}" title="">view this item</a></p>
-      </li>
-    {% endfor %}
-    </ul>
-     {% endif %}
-
-    <div class="paginate clearfix">
-      {{ paginate | default_pagination }}
-    </div>
-
-
-    <div id="three-reasons" class="clearfix">
-      <h3>Why Shop With Us?</h3>
-      <ul>
-        <li class="two-a">
-          <h4>24 Hours</h4>
-          <p>We're always here to help.</p>
-        </li>
-        <li class="two-c">
-          <h4>No Spam</h4>
-          <p>We'll never share your info.</p>
-        </li>
-        <li class="two-d">
-          <h4>Secure Servers</h4>
-          <p>Checkout is 256bit encrypted.</p>
-        </li>
-      </ul>
-    </div>
-  </div>
-
-{% endpaginate %}
-{% endif %}
diff --git a/performance/tests/tribble/theme.liquid b/performance/tests/tribble/theme.liquid
deleted file mode 100644
index c353c86..0000000
--- a/performance/tests/tribble/theme.liquid
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>{{shop.name}} - {{page_title}}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-  {{ 'reset.css'     | asset_url | stylesheet_tag }}
-  {{ 'style.css'     | asset_url | stylesheet_tag }}
-
-  {{ 'lightbox.css'                         | asset_url | stylesheet_tag }}
-  {{ 'prototype/1.6/prototype.js'           | global_asset_url  | script_tag }}
-  {{ 'scriptaculous/1.8.2/scriptaculous.js' | global_asset_url  | script_tag }}
-  {{ 'lightbox.js'                          | asset_url | script_tag }}
-  {{ 'option_selection.js'                  | shopify_asset_url | script_tag }}
-
-  {{ content_for_header }}
-</head>
-<body id="page-{{template}}">
-
-<div id="wrap">
-
-  <div id="top">
-    <div id="cart">
-      <h3>Shopping Cart</h3>
-      <p class="cart-count">
-        {% if cart.item_count == 0 %}
-          Your cart is currently empty
-        {% else %}
-          {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} <span>-</span> Total: {{cart.total_price | money_with_currency }} <span>-</span> <a href="/cart">View Cart</a>
-        {% endif %}
-      </p>
-    </div>
-
-    <div id="site-title">
-      <h3><a href="/">{{shop.name}}</a></h3>
-      <h4><span>Tribble: A Shopify Theme</span></h4>
-
-    </div>
-  </div>
-
-  <ul id="nav">
-    {% for link in linklists.main-menu.links %}
-     <li>{{ link.title | link_to: link.url }}</li>
-    {% endfor %}
-  </ul>
-
-  {{ content_for_layout }}
-
-  <div id="foot" class="clearfix">
-    <div class="quick-links">
-      <h4>Quick Navigation</h4>
-      <ul class="clearfix">
-        <li><a href="/">Home</a></li>
-        <li><a href="#top">Back to top</a></li>
-        {% for link in linklists.main-menu.links %}
-         <li>{{ link.title | link_to: link.url }}</li>
-        {% endfor %}
-      </ul>
-    </div>
-
-    <div class="quick-contact">
-      <h4>Quick Contact</h4>
-      <div class="vcard">
-
-          <div class="org fn">
-             <div class="organization-name">Really Great Widget Co.</div>
-          </div>
-        <div class="adr">
-            <span class="street-address">2531 Barrington Court</span>
-            <span class="locality">Hayward</span>,
-          <abbr title="California" class="region">CA</abbr>
-            <span class="postal-code">94545</span>
-         </div>
-        <a class="email" href="mailto:email@myshopifysite.com">
-          email@myshopifysite.com
-        </a>
-        <div class="tel">
-          <span class="type">Support:</span> <span class="value">800-555-9954</span>
-        </div>
-      </div>
-
-    </div>
-
-    <p><a href="http://shopify.com" class="we-made">Powered by Shopify</a> &copy; Copyright {{ "now" | date: "%Y" }} {{ shop.name }}, All Rights Reserved.  <a href="/blogs/news.xml" id="foot-rss">RSS Feed</a></p>
-  </div>
-
-</div>
-
-</body>
-</html>
diff --git a/performance/tests/vogue/article.liquid b/performance/tests/vogue/article.liquid
deleted file mode 100644
index a7196fd..0000000
--- a/performance/tests/vogue/article.liquid
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="article">
-  <h3 class="article-head-title">{{ article.title }}</h3>
-  <p> posted {{ article.created_at | date: "%Y %h" }} by {{ article.author }}</p>
-  <div class="article-body textile">
-    {{ article.content }}
-  </div>
-</div>
-
-{% if blog.comments_enabled? %}
-<div id="comments">
-  <h3>Comments</h3>
-  <!-- List all comments -->
-
-  <ul>
-  {% for comment in article.comments %}
-    <li>
-      <div class="comment">
-        {{ comment.content }}
-      </div>
-
-      <div class="comment-details">
-        Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
-      </div>
-    </li>
-  {% endfor %}
-  </ul>
-
-  <!-- Comment Form -->
-  {% form article %}
-    <h3>Leave a comment</h3>
-
-    <!-- Check if a comment has been submitted in the last request, and if yes display an appropriate message -->
-    {% if form.posted_successfully? %}
-      {% if blog.moderated? %}
-        <div class="notice">
-          Successfully posted your comment.<br />
-          It will have to be approved by the blog owner first before showing up.
-        </div>
-      {% else %}
-        <div class="notice">Successfully posted your comment.</div>
-      {% endif %}
-    {% endif %}
-
-    {% if form.errors %}
-      <div class="notice error">Not all the fields have been filled out correctly!</div>
-    {% endif %}
-
-    <dl>
-      <dt class="{% if form.errors contains 'author' %}error{% endif %}"><label for="comment_author">Your name</label></dt>
-      <dd><input type="text" id="comment_author" name="comment[author]" size="40" value="{{form.author}}" class="{% if form.errors contains 'author' %}input-error{% endif %}" /></dd>
-
-      <dt class="{% if form.errors contains 'email' %}error{% endif %}"><label for="comment_email">Your email</label></dt>
-      <dd><input type="text" id="comment_email" name="comment[email]" size="40" value="{{form.email}}" class="{% if form.errors contains 'email' %}input-error{% endif %}" /></dd>
-
-      <dt class="{% if form.errors contains 'body' %}error{% endif %}"><label for="comment_body">Your comment</label></dt>
-      <dd><textarea id="comment_body" name="comment[body]" cols="40" rows="5" class="{% if form.errors contains 'body' %}input-error{% endif %}">{{form.body}}</textarea></dd>
-    </dl>
-
-    {% if blog.moderated? %}
-      <p class="hint">comments have to be approved before showing up</p>
-    {% endif %}
-
-    <input type="submit" value="Post comment" />
-  {% endform %}
-</div>
-{% endif %}
diff --git a/performance/tests/vogue/blog.liquid b/performance/tests/vogue/blog.liquid
deleted file mode 100644
index 8ce5583..0000000
--- a/performance/tests/vogue/blog.liquid
+++ /dev/null
@@ -1,32 +0,0 @@
-<div id="shop-id-label_about">
-<h3 class="article-head-title">{{page.title}}</h3>
-
-{% paginate blog.articles by 20 %}
-
-  {% for article in blog.articles  %}
-    <div class="article">
-      <h3 class="article-head-title">
-        <a href="{{article.url}}">{{ article.title }}</a>
-      </h3>
-
-      <p>
-      {% if blog.comments_enabled? %}
-        <a href="{{article.url}}#comments">{{ article.comments_count }} comments</a>
-        &mdash;
-      {% endif %}
-      posted {{ article.created_at | date: "%Y %h" }} by {{ article.author }}</p>
-      <div class="article-body textile">
-        {{ article.content }}
-      </div>
-    </div>
-  {% endfor %}
-
-  <div id="pagination">
-    {{ paginate | default_pagination }}
-  </div>
-
-{% endpaginate %}
-
-
-</div>
-<div class="clear-me"></div>
diff --git a/performance/tests/vogue/cart.liquid b/performance/tests/vogue/cart.liquid
deleted file mode 100644
index b997bd8..0000000
--- a/performance/tests/vogue/cart.liquid
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>Shopping Cart</h1>
-{% if cart.item_count == 0 %}
-  <p><strong>Your shopping basket is empty.</strong> Perhaps a featured item below is of interest...</p>
-  <table id="gallery">
-  {% tablerow product in collections.frontpage.products cols: 3 limit: 12 %}
-    <div class="gallery-image">
-      <a href="{{ product.url | within: collections.frontpage }}" title="{{ product.title | escape }} &mdash; {{ product.description | strip_html | truncate: 50 | escape }}"><img src="{{ product.images.first | product_img_url: 'medium' }}" alt="{{ product.title | escape }}" /></a>
-    </div>
-    <div class="gallery-info">
-      <a href="{{ product.url | within: collections.frontpage }}">{{ product.title | truncate: 30 }}</a><br />
-      <small>{{ product.price | money }}{% if product.compare_at_price_max > product.price %} <del>{{ product.compare_at_price_max | money }}</del>{% endif %}</small>
-    </div>
-  {% endtablerow %}
-  </table>
-{% else %}
-<script type="text/javascript">
-  function remove_item(id) {
-      document.getElementById('updates_'+id).value = 0;
-      document.getElementById('cartform').submit();
-  }
-</script>
-<form action="/cart" method="post" id="cartform">
-  <table id="basket">
-    <tr>
-      <th>Item Description</th>
-      <th>Price</th>
-      <th>Qty</th>
-      <th>Delete</th>
-      <th>Total</th>
-    </tr>{% for item in cart.items %}
-    <tr class="basket-{% cycle 'odd', 'even' %}">
-      <td class="basket-column-one">
-        <div class="basket-images">
-          <a href="{{ item.product.url }}" title="{{ item.title | escape }} &mdash; {{ item.product.description | strip_html | truncate: 50 | escape }}"><img src="{{ item.product.images.first | product_img_url: 'thumb' }}" alt="{{ item.title | escape }}" /></a>
-        </div>
-        <div class="basket-desc">
-          <p><a href="{{ item.product.url }}">{{ item.title }}</a></p>
-          {{ item.product.description | strip_html | truncate: 120 }}
-        </div>
-      </td>
-      <td class="basket-column">{{ item.price | money }}{% if item.variant.compare_at_price > item.price %}<br /><del>{{ item.variant.compare_at_price | money }}</del>{% endif %}</td>
-      <td class="basket-column"><input type="text" size="4" name="updates[{{item.variant.id}}]" id="updates_{{ item.variant.id }}" value="{{ item.quantity }}" onfocus="this.select();"/></td>
-      <td class="basket-column"><a href="#" onclick="remove_item({{ item.variant.id }}); return false;">Remove</a></td>
-      <td class="basket-column">{{ item.line_price | money }}</td>
-    </tr>{% endfor %}
-  </table>
-  <div id="basket-right">
-    <h3>Subtotal {{ cart.total_price | money }}</h3>
-    <input type="image" src="{{ 'update.png' | asset_url }}" id="update-cart" name="update" value="Update" />
-    <input type="image" src="{{ 'checkout.png' | asset_url }}" name="checkout" value="Checkout" />
-    {% if additional_checkout_buttons %}
-    <div class="additional-checkout-buttons">
-      <p>- or -</p>
-      {{ content_for_additional_checkout_buttons }}
-    </div>
-    {% endif %}
-  </div>
-</form>{% endif %}
diff --git a/performance/tests/vogue/collection.liquid b/performance/tests/vogue/collection.liquid
deleted file mode 100644
index e1fa4c0..0000000
--- a/performance/tests/vogue/collection.liquid
+++ /dev/null
@@ -1,19 +0,0 @@
-{% paginate collection.products by 12 %}{% if collection.products.size == 0 %}
-  <strong>No products found in this collection.</strong>{% else %}
-  <h1>{{ collection.title }}</h1>
-  {{ collection.description }}
-  <table id="gallery">
-  {% tablerow product in collection.products cols: 3 %}
-    <div class="gallery-image">
-      <a href="{{ product.url | within: collection }}" title="{{ product.title | escape }} &mdash; {{ product.description | strip_html | truncate: 50 | escape }}"><img src="{{ product.images.first | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
-    </div>
-    <div class="gallery-info">
-      <a href="{{ product.url | within: collection }}">{{ product.title | truncate: 30 }}</a><br />
-      <small>{{ product.price | money }}{% if product.compare_at_price_max > product.price %} <del>{{ product.compare_at_price_max | money }}</del>{% endif %}</small>
-    </div>
-  {% endtablerow %}
-  </table>{% if paginate.pages > 1 %}
-  <div id="paginate">
-    {{ paginate | default_pagination }}
-  </div>{% endif %}{% endif %}
-{% endpaginate %}
diff --git a/performance/tests/vogue/index.liquid b/performance/tests/vogue/index.liquid
deleted file mode 100644
index 1cfc291..0000000
--- a/performance/tests/vogue/index.liquid
+++ /dev/null
@@ -1,22 +0,0 @@
-  <div id="about-excerpt">
-    {% assign article = pages.frontpage %}
-    {% if article.content != "" %}
-      <h2>{{ article.title }}</h2>
-      {{ article.content }}
-    {% else %}
-      In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />
-      {{ "Learn more about handles" | link_to: "http://wiki.shopify.com/Handle" }}
-    {% endif %}
-  </div>
-
-  <table id="gallery">
-  {% tablerow product in collections.frontpage.products cols: 3 limit: 12 %}
-    <div class="gallery-image">
-      <a href="{{ product.url | within: collections.frontpage }}" title="{{ product.title | escape }} &mdash; {{ product.description | strip_html | truncate: 50 | escape }}"><img src="{{ product.images.first | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
-    </div>
-    <div class="gallery-info">
-      <a href="{{ product.url | within: collections.frontpage }}">{{ product.title | truncate: 30 }}</a><br />
-      <small>{{ product.price | money }}{% if product.compare_at_price_max > product.price %} <del>{{ product.compare_at_price_max | money }}</del>{% endif %}</small>
-    </div>
-  {% endtablerow %}
-  </table>
diff --git a/performance/tests/vogue/page.liquid b/performance/tests/vogue/page.liquid
deleted file mode 100644
index 1ea6661..0000000
--- a/performance/tests/vogue/page.liquid
+++ /dev/null
@@ -1,3 +0,0 @@
-  <h1>{{ page.title }}</h1>
-  {{ page.content }}
-
diff --git a/performance/tests/vogue/product.liquid b/performance/tests/vogue/product.liquid
deleted file mode 100644
index a9a0ddc..0000000
--- a/performance/tests/vogue/product.liquid
+++ /dev/null
@@ -1,62 +0,0 @@
-<div id="product-left">
-  {% for image in product.images %}{% if forloop.first %}<div id="product-image">
-    <a href="{{ image | product_img_url: 'large' }}" rel="lightbox[images]" title="{{ product.title | escape }}"><img src="{{ image | product_img_url: 'medium' }}" alt="{{ product.title | escape }}" /></a>
-  </div>{% else %}
-  <div class="product-images">
-    <a href="{{ image | product_img_url: 'large' }}" rel="lightbox[images]" title="{{ product.title | escape }}"><img src="{{ image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
-  </div>{% endif %}{% endfor %}
-</div>
-<div id="product-right">
-  <h1>{{ product.title }}</h1>
-  {{ product.description }}
-
-  {% if product.available %}
-  <form action="/cart/add" method="post">
-
-    <div id="product-variants">
-      <div id="price-field"></div>
-
-      <select id="product-select" name='id'>
-        {% for variant in product.variants %}
-          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
-        {% endfor %}
-      </select>
-    </div>
-
-    <input type="image" src="{{ 'purchase.png' | asset_url }}" name="add" value="Purchase" id="purchase" />
-  </form>
-  {% else %}
-    <p class="bold-red">This product is temporarily unavailable</p>
-  {% endif %}
-
-  <div id="product-details">
-    <strong>Continue Shopping</strong><br />
-    Browse more {{ product.type | link_to_type }} or additional {{ product.vendor | link_to_vendor }} products.
-  </div>
-</div>
-
-
-<script type="text/javascript">
-<!--
-  // mootools callback for multi variants dropdown selector
-  var selectCallback = function(variant, selector) {
-    if (variant && variant.available == true) {
-      // selected a valid variant
-      $('purchase').removeClass('disabled'); // remove unavailable class from add-to-cart button
-      $('purchase').disabled = false;           // reenable add-to-cart button
-      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
-    } else {
-      // variant doesn't exist
-      $('purchase').addClass('disabled');      // set add-to-cart button to unavailable class
-      $('purchase').disabled = true;              // disable add-to-cart button
-      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
-    }
-  };
-
-  // initialize multi selector for product
-  window.addEvent('domready', function() {
-    new Shopify.OptionSelectors("product-select", { product: {{ product | json }}, onVariantSelected: selectCallback });
-  });
--->
-</script>
-
diff --git a/performance/tests/vogue/theme.liquid b/performance/tests/vogue/theme.liquid
deleted file mode 100644
index 914c03f..0000000
--- a/performance/tests/vogue/theme.liquid
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<title>{{ shop.name }} &mdash; {{ page_title }}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-{{ 'stylesheet.css' | asset_url | stylesheet_tag }}
-
-<!-- Additional colour schemes for this theme. If you want to use them, just replace the above line with one of these
-{{ 'caramel.css' | asset_url | stylesheet_tag }}
-{{ 'sea.css' | asset_url | stylesheet_tag }}
--->
-
-{{ 'mootools.js'        | global_asset_url  | script_tag }}
-{{ 'slimbox.js'         | global_asset_url  | script_tag }}
-{{ 'option_selection.js' | shopify_asset_url | script_tag }}
-
-{{ content_for_header }}
-</head>
-
-<body id="page-{{ template }}">
-
-<div id="header">
-  <div class="container">
-    <div id="logo">
-      <h1><a href="/" title="{{ shop.name }}">{{ shop.name }}</a></h1>
-    </div>
-    <div id="navigation">
-      <ul id="navigate">
-        <li><a href="/cart">View Cart</a></li>
-        {% for link in linklists.main-menu.links reversed %}
-          <li><a href="{{ link.url }}">{{ link.title }}</a></li>
-        {% endfor %}
-      </ul>
-    </div>
-  </div>
-</div>
-
-<div id="mini-header">
-  <div class="container">
-    <div id="shopping-cart">
-      <a href="/cart">Your shopping cart contains {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}</a>
-    </div>
-    <div id="search-box">
-      <form action="/search" method="get">
-        <input type="text" name="q" id="q" />
-        <input type="image" src="{{ 'seek.png' | asset_url }}" value="Seek" onclick="this.parentNode.submit(); return false;" id="seek" />
-      </form>
-    </div>
-  </div>
-</div>
-
-<div id="layout">
-  <div class="container">
-    <div id="layout-left" {% if template != "cart" %}{% if template != "product" %}style="width:619px"{% endif %}{% endif %}>{% if template == "search" %}
-      <h1>Search Results</h1>{% endif %}
-      {{ content_for_layout }}
-    </div>{% if template != "cart" %}{% if template != "product" %}
-
-    <div id="layout-right">
-      {% if template == "index" %}
-      {% if blogs.news.articles.size > 1 %}
-      <a href="{{ shop.url }}/blogs/news.xml"><img src="{{ 'feed.png' | asset_url }}" alt="Subscribe" class="feed" /></a>
-      <h3><a href="/blogs/news">More news</a></h3>
-      <ul id="blogs">{% for article in blogs.news.articles limit: 6 offset: 1 %}
-        <li><a href="{{ article.url }}">{{ article.title | strip_html | truncate: 30 }}</a><br />
-          <small>{{ article.content | strip_html | truncatewords: 12 }}</small>
-        </li>{% endfor %}
-      </ul>
-      {% endif %}
-      {% endif %}
-
-      {% if template == "collection" %}
-      <h3>Collection Tags</h3>
-      <div id="tags">{% if collection.tags.size == 0 %}
-        No tags found.{% else %}
-        <span class="tags">{% for tag in collection.tags %}{% if current_tags contains tag %} {{ tag | highlight_active_tag | link_to_remove_tag: tag }}{% else %} {{ tag | highlight_active_tag | link_to_add_tag: tag }}{% endif %}{% unless forloop.last %}, {% endunless %}{% endfor %}</span>{% endif %}
-      </div>
-      {% endif %}
-
-      <h3>Navigation</h3>
-      <ul id="links">
-      {% for link in linklists.main-menu.links %}
-        <li><a href="{{ link.url }}">{{ link.title }}</a></li>
-      {% endfor %}
-      </ul>
-
-      {% if template != "page" %}
-      <h3>Featured Products</h3>
-      <ul id="featuring">{% for product in collections.frontpage.products limit: 6 %}
-        <li class="featuring-list">
-          <div class="featuring-image">
-            <a href="{{ product.url | within: collections.frontpage }}" title="{{ product.title | escape }} &mdash; {{ product.description | strip_html | truncate: 50 }}"><img src="{{ product.images.first | product_img_url: 'icon' }}" alt="{{ product.title | escape }}" /></a>
-          </div>
-          <div class="featuring-info">
-            <a href="{{ product.url | within: collections.frontpage }}">{{ product.title | strip_html | truncate: 28 }}</a><br />
-            <small><span class="light">from</span> {{ product.price | money }}</small>
-          </div>
-        </li>{% endfor %}
-      </ul>
-      {% endif %}
-    </div>{% endif %}{% endif %}
-  </div>
-</div>
-
-<div id="footer">
-  <div id="footer-fader">
-    <div class="container">
-      <div id="footer-right">{% for link in linklists.footer.links %}
-        {{ link.title | link_to: link.url }} {% unless forloop.last %}&#124;{% endunless %}{% endfor %}
-      </div>
-      <span id="footer-left">
-        Copyright &copy; {{ "now" | date: "%Y" }} <a href="/">{{ shop.name }}</a>. All Rights Reserved. All prices {{ shop.currency }}.<br />
-        This website is powered by <a href="http://www.shopify.com">Shopify</a>.
-      </span>
-    </div>
-  </div>
-</div>
-
-</body>
-</html>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index fe7c22a..65e93da 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,25 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#"
-			count: 3
-			path: performance/Shopify/CustomFilters.php
-
-		-
-			message: "#^Cannot access offset 'articles' on mixed\\.$#"
-			count: 1
-			path: performance/Shopify/Database.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(mixed\\)\\: mixed\\)\\|null, Closure\\(array\\)\\: non\\-empty\\-array given\\.$#"
-			count: 1
-			path: performance/Shopify/Database.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function array_filter expects \\(callable\\(mixed\\)\\: bool\\)\\|null, Closure\\(array\\)\\: bool given\\.$#"
-			count: 1
-			path: performance/Shopify/Database.php
-
 		-
 			message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#"
 			count: 1

From 47af566d52bb4ecd67773bfb1c99424f95884900 Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 12:49:01 +0200
Subject: [PATCH 08/11] Rebuild the benchmark fixture as a storefront theme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renames the theme to `storefront` (it renders four page types, not one
collection), replaces the fixture's inline data with a typed drop layer, and
deepens the theme into something a real storefront page would look like.

Data layer. `Database` is a typed-drop factory rather than the generic
array-wrapping table store the deleted Shopify harness used: ten drops, one per
entity, no recursive conversion and no phpstan suppressions. Two rules keep the
benchmark measuring the library instead of the fixture — it assigns rather than
computes, and it memoizes nothing, so #[Cache] starts cold on every render and no
state is shared across revolutions. Building the fixture is ~6% of benchRender.

Drop resolution strategies are assigned deliberately, each where a real drop
would use it: public typed properties for stored fields, methods for derived
values, #[Cache] on the one method that walks every variant and is read by three
snippets, and liquidMethodMissing only on metafields, where keys are genuinely
arbitrary. DatabaseDrop is gone and performance/Shopify/ with it.

Theme. Twenty-nine templates across the same four pages: real head metadata,
nested navigation, breadcrumbs, a filter sidebar, a variant picker, a specs
table, a multi-column footer. It now uses the tags a real theme uses — case,
capture, cycle, for/else, break, continue and {% liquid %} — and the fabricated
padding that repeated inventory_label five times per product is gone. Tags real
themes barely touch stay out; they belong in micro subjects.

Verification. Benchmarks run with library defaults, but the fixture test renders
every page with strictVariables, strictFilters and rethrowErrors on, so a missing
variable, filter or swallowed error fails the suite rather than rendering as
empty output. No snapshots: the theme is expected to keep growing, and a
regenerated snapshot asserts nothing.

performance/README.md records the design constraints that are invisible in the
code, and the deferred list — per-tag micro subjects, the drop miss path,
size-parameterized scaling, coverage-only tags, TemplateCacheBench's shape, and
the CI base run's missing --group=macro.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 performance/README.md                         | 106 ++++
 performance/Shopify/DatabaseDrop.php          |  41 --
 performance/Support/Database.php              | 468 ++++++++++++++++++
 performance/Support/Drops/ArticleDrop.php     |  27 +
 performance/Support/Drops/CartDrop.php        |  24 +
 performance/Support/Drops/CollectionDrop.php  |  32 ++
 performance/Support/Drops/ImageDrop.php       |  24 +
 performance/Support/Drops/LinkDrop.php        |  13 +
 performance/Support/Drops/MetafieldsDrop.php  |  34 ++
 performance/Support/Drops/PageDrop.php        |  23 +
 performance/Support/Drops/ProductDrop.php     |  67 +++
 performance/Support/Drops/ShopDrop.php        |  15 +
 performance/Support/Drops/VariantDrop.php     |  16 +
 performance/Support/StorefrontFilters.php     |  23 +
 performance/Support/StorefrontTheme.php       | 192 +++++++
 performance/benchmarks/OperationBench.php     |  10 +-
 .../Support/ComplexThemeFixture.php           | 282 -----------
 performance/benchmarks/TemplateCacheBench.php |  12 +-
 performance/benchmarks/ThemeBench.php         |  31 +-
 performance/profile-theme.php                 |   8 +-
 .../complex-collection/layout/theme.liquid    |  12 -
 .../snippets/collection/grid.liquid           |   3 -
 .../snippets/collection/header.liquid         |   7 -
 .../snippets/collection/navigation.liquid     |   6 -
 .../snippets/index/featured_products.liquid   |   6 -
 .../snippets/index/hero.liquid                |   6 -
 .../snippets/index/journal.liquid             |   6 -
 .../snippets/page/content.liquid              |   4 -
 .../snippets/page/header.liquid               |   4 -
 .../snippets/product/card.liquid              |   9 -
 .../snippets/product/detail.liquid            |  10 -
 .../snippets/product/media.liquid             |   4 -
 .../snippets/product/metadata.liquid          |   8 -
 .../snippets/product/pricing.liquid           |   5 -
 .../snippets/shared/button.liquid             |   1 -
 .../snippets/shared/icon.liquid               |   3 -
 .../snippets/shared/price.liquid              |   1 -
 .../snippets/shared/site_footer.liquid        |   6 -
 .../snippets/shared/site_header.liquid        |   9 -
 .../templates/collection.liquid               |  10 -
 .../complex-collection/templates/index.liquid |   5 -
 .../complex-collection/templates/page.liquid  |   4 -
 .../templates/product.liquid                  |   3 -
 .../themes/storefront/layout/theme.liquid     |  14 +
 .../snippets/collection/filters.liquid        |  16 +
 .../snippets/collection/grid.liquid           |   9 +
 .../snippets/collection/header.liquid         |   9 +
 .../snippets/collection/toolbar.liquid        |  16 +
 .../snippets/index/featured_products.liquid   |  11 +
 .../storefront/snippets/index/hero.liquid     |  11 +
 .../storefront/snippets/index/journal.liquid  |  22 +
 .../storefront/snippets/page/content.liquid   |  10 +
 .../storefront/snippets/page/header.liquid    |   4 +
 .../storefront/snippets/product/badges.liquid |   6 +
 .../storefront/snippets/product/card.liquid   |  12 +
 .../storefront/snippets/product/detail.liquid |  13 +
 .../snippets/product/gallery.liquid           |   8 +
 .../snippets/product/pricing.liquid           |   7 +
 .../storefront/snippets/product/specs.liquid  |  10 +
 .../snippets/product/variant_picker.liquid    |  21 +
 .../snippets/shared/breadcrumbs.liquid        |   9 +
 .../storefront/snippets/shared/button.liquid  |   2 +
 .../storefront/snippets/shared/icon.liquid    |   7 +
 .../snippets/shared/meta_tags.liquid          |  23 +
 .../snippets/shared/newsletter.liquid         |   9 +
 .../storefront/snippets/shared/price.liquid   |   1 +
 .../snippets/shared/site_footer.liquid        |  20 +
 .../snippets/shared/site_header.liquid        |  18 +
 .../storefront/templates/collection.liquid    |  13 +
 .../themes/storefront/templates/index.liquid  |   5 +
 .../themes/storefront/templates/page.liquid   |   5 +
 .../storefront/templates/product.liquid       |  13 +
 .../Performance/ComplexThemeFixtureTest.php   |  38 --
 .../Performance/StorefrontThemeTest.php       | 132 +++++
 74 files changed, 1558 insertions(+), 516 deletions(-)
 create mode 100644 performance/README.md
 delete mode 100644 performance/Shopify/DatabaseDrop.php
 create mode 100644 performance/Support/Database.php
 create mode 100644 performance/Support/Drops/ArticleDrop.php
 create mode 100644 performance/Support/Drops/CartDrop.php
 create mode 100644 performance/Support/Drops/CollectionDrop.php
 create mode 100644 performance/Support/Drops/ImageDrop.php
 create mode 100644 performance/Support/Drops/LinkDrop.php
 create mode 100644 performance/Support/Drops/MetafieldsDrop.php
 create mode 100644 performance/Support/Drops/PageDrop.php
 create mode 100644 performance/Support/Drops/ProductDrop.php
 create mode 100644 performance/Support/Drops/ShopDrop.php
 create mode 100644 performance/Support/Drops/VariantDrop.php
 create mode 100644 performance/Support/StorefrontFilters.php
 create mode 100644 performance/Support/StorefrontTheme.php
 delete mode 100644 performance/benchmarks/Support/ComplexThemeFixture.php
 delete mode 100644 performance/themes/complex-collection/layout/theme.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/collection/grid.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/collection/header.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/collection/navigation.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/index/featured_products.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/index/hero.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/index/journal.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/page/content.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/page/header.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/product/card.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/product/detail.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/product/media.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/product/metadata.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/product/pricing.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/shared/button.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/shared/icon.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/shared/price.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/shared/site_footer.liquid
 delete mode 100644 performance/themes/complex-collection/snippets/shared/site_header.liquid
 delete mode 100644 performance/themes/complex-collection/templates/collection.liquid
 delete mode 100644 performance/themes/complex-collection/templates/index.liquid
 delete mode 100644 performance/themes/complex-collection/templates/page.liquid
 delete mode 100644 performance/themes/complex-collection/templates/product.liquid
 create mode 100644 performance/themes/storefront/layout/theme.liquid
 create mode 100644 performance/themes/storefront/snippets/collection/filters.liquid
 create mode 100644 performance/themes/storefront/snippets/collection/grid.liquid
 create mode 100644 performance/themes/storefront/snippets/collection/header.liquid
 create mode 100644 performance/themes/storefront/snippets/collection/toolbar.liquid
 create mode 100644 performance/themes/storefront/snippets/index/featured_products.liquid
 create mode 100644 performance/themes/storefront/snippets/index/hero.liquid
 create mode 100644 performance/themes/storefront/snippets/index/journal.liquid
 create mode 100644 performance/themes/storefront/snippets/page/content.liquid
 create mode 100644 performance/themes/storefront/snippets/page/header.liquid
 create mode 100644 performance/themes/storefront/snippets/product/badges.liquid
 create mode 100644 performance/themes/storefront/snippets/product/card.liquid
 create mode 100644 performance/themes/storefront/snippets/product/detail.liquid
 create mode 100644 performance/themes/storefront/snippets/product/gallery.liquid
 create mode 100644 performance/themes/storefront/snippets/product/pricing.liquid
 create mode 100644 performance/themes/storefront/snippets/product/specs.liquid
 create mode 100644 performance/themes/storefront/snippets/product/variant_picker.liquid
 create mode 100644 performance/themes/storefront/snippets/shared/breadcrumbs.liquid
 create mode 100644 performance/themes/storefront/snippets/shared/button.liquid
 create mode 100644 performance/themes/storefront/snippets/shared/icon.liquid
 create mode 100644 performance/themes/storefront/snippets/shared/meta_tags.liquid
 create mode 100644 performance/themes/storefront/snippets/shared/newsletter.liquid
 create mode 100644 performance/themes/storefront/snippets/shared/price.liquid
 create mode 100644 performance/themes/storefront/snippets/shared/site_footer.liquid
 create mode 100644 performance/themes/storefront/snippets/shared/site_header.liquid
 create mode 100644 performance/themes/storefront/templates/collection.liquid
 create mode 100644 performance/themes/storefront/templates/index.liquid
 create mode 100644 performance/themes/storefront/templates/page.liquid
 create mode 100644 performance/themes/storefront/templates/product.liquid
 delete mode 100644 tests/Integration/Performance/ComplexThemeFixtureTest.php
 create mode 100644 tests/Integration/Performance/StorefrontThemeTest.php

diff --git a/performance/README.md b/performance/README.md
new file mode 100644
index 0000000..08228a1
--- /dev/null
+++ b/performance/README.md
@@ -0,0 +1,106 @@
+# Benchmark suite
+
+```bash
+composer benchmark          # macro group: the storefront theme and template caches
+composer benchmark:micro    # micro group: individual operations
+php performance/profile-theme.php --output=profile.json
+```
+
+## What each group is for
+
+The two groups have different jobs, and conflating them is how a benchmark suite
+stops being useful.
+
+**`macro`** (`ThemeBench`, `TemplateCacheBench`) renders the storefront theme —
+29 templates across four pages. It answers *"did rendering get slower"* and
+nothing more. It cannot tell you *what* got slower, because a regression in any
+one tag is averaged across everything else. Don't expect it to localize.
+
+**`micro`** (`OperationBench`) measures single operations on tiny templates. This
+is where per-feature sensitivity lives, and where a benchmark is allowed to be
+unrealistic: an artificial template that does one thing 64 times is a better
+instrument than a realistic page.
+
+The split is what lets the theme be realistic. Whenever realism and measurement
+sensitivity conflict inside the theme, realism wins — sensitivity is not the
+theme's job.
+
+## The storefront fixture
+
+`performance/themes/storefront/` is a deliberately plausible storefront: real
+`<head>` metadata, nested navigation, breadcrumbs, a product grid, a filter
+sidebar, a variant picker, a multi-column footer. It uses only tags a real theme
+would use (`render`, `for`/`else`, `if`, `unless`, `case`, `capture`, `cycle`,
+`assign`, `break`, `continue`, `{% liquid %}`).
+
+Constraints that are not obvious from reading the code:
+
+- **`Database` assigns, it does not compute.** No scans, no reductions, no
+  sorting. Nothing is memoized either, so the whole object graph is rebuilt on
+  every render *inside the measured region* — any computation added here is paid
+  160 times per iteration and moves the macro numbers for reasons that have
+  nothing to do with the library. Derived values go into the literal data or
+  onto a drop method, where they are measured as template work. Building the
+  fixture is roughly **6% of `ThemeBench::benchRender`**; if that share climbs,
+  the macro numbers are drifting for fixture reasons and something here computes
+  when it should assign.
+- **Fixed dataset: 24 products.** A deliberate page size, not an accident.
+- **Fresh drops per render.** `#[Cache]` therefore starts cold on every render,
+  and no state is shared between revolutions. Memoized instances would measure a
+  warm cache 95% of the time and leak `ContextAware` state across revs.
+- **Two render contexts per page.** The page renders into one, the layout into
+  another. Consequence: nothing under `layout/` may read a variable a template
+  assigned — it would render empty.
+- **No missing lookups.** Every field the theme reads exists, so empty output in
+  a benchmark is a bug rather than an expected state.
+- **Template sources are read in `setUp`,** never inside a subject. Reading 29
+  files per revolution measured the filesystem, not the tokenizer.
+
+### Drop resolution strategies
+
+`Drop::__get` resolves names through four branches of very different cost, so the
+fixture assigns them on purpose rather than by accident — while keeping each one
+somewhere a real storefront drop would genuinely use it:
+
+| Strategy | Cost | Where the fixture uses it |
+| --- | --- | --- |
+| Public typed property | Cheapest — first lookup loop | Stored fields: `title`, `handle`, `price_cents` |
+| Invokable method | Misses the property loop first | Derived values: `on_sale`, `saving_cents`, `url` |
+| `#[Cache]`d method | Method cost, once per instance | `in_stock_variant_count` — walks every variant, read by three snippets |
+| `liquidMethodMissing` | Most expensive; a **miss** throws and catches up to three exceptions | `MetafieldsDrop` only, where keys are genuinely arbitrary |
+
+## Verifying the fixture
+
+Benchmarks run with the library defaults, because that is what an application
+looks like. `tests/Integration/Performance/StorefrontThemeTest.php` instead
+renders every page with `strictVariables`, `strictFilters` and `rethrowErrors`
+all on, so a missing variable, a missing filter or a swallowed render error fails
+the suite instead of quietly rendering as empty output.
+
+There are deliberately **no snapshot assertions**. The theme is expected to keep
+growing, and a snapshot over a fast-changing fixture gets regenerated on autopilot
+until it asserts nothing. Strict mode cannot be silenced that way.
+
+## Deferred
+
+Known gaps, in rough priority order:
+
+- **Per-tag `micro` subjects.** Nothing isolates `case`, `capture`, `cycle`,
+  `render` depth, or property-vs-method resolution. Until this lands, the suite
+  can see that something regressed but not what.
+- **The drop miss path.** The most expensive branch of `Drop::__get` (a
+  `liquidMethodMissing` miss, up to three thrown exceptions) is unmeasured. It
+  belongs in `micro`, not the theme, because the theme must stay strict.
+- **Size-parameterized scaling.** With one fixed dataset, nothing distinguishes
+  "everything is 10% slower" from "something became superlinear". A
+  `ParamProviders` spread (4 / 24 / 96 products) would show the shape.
+- **Coverage-only tags.** `tablerow`, `increment`, `decrement`, `ifchanged`,
+  `raw` and `doc` are unbenchmarked. Real themes barely use them, so they belong
+  in `micro` rather than in the theme.
+- **`TemplateCacheBench` shape.** Six subjects driven by six near-identical
+  `setUp*` wrappers around a string `match` — this is what `ParamProviders`
+  exists for. Its cache path is also a fixed `sys_get_temp_dir()` directory, so
+  two concurrent runs collide.
+- **CI base run.** `.github/workflows/phpbench.yml` passes `--group=macro` to the
+  PR run but not the base run, so the base executes micro benchmarks too. It can
+  be aligned once `main` has the group attributes.
diff --git a/performance/Shopify/DatabaseDrop.php b/performance/Shopify/DatabaseDrop.php
deleted file mode 100644
index 7654fc2..0000000
--- a/performance/Shopify/DatabaseDrop.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance\Shopify;
-
-use Keepsuit\Liquid\Drop;
-use Keepsuit\Liquid\Exceptions\UndefinedDropMethodException;
-
-class DatabaseDrop extends Drop implements \JsonSerializable
-{
-    /**
-     * @param  array<string, mixed>  $data
-     */
-    public function __construct(
-        private readonly array $data,
-    ) {}
-
-    public function liquidMethodMissing(string $name): mixed
-    {
-        if (array_key_exists($name, $this->data)) {
-            return $this->data[$name];
-        }
-
-        throw new UndefinedDropMethodException($name);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(): array
-    {
-        return $this->data;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function jsonSerialize(): array
-    {
-        return $this->data;
-    }
-}
diff --git a/performance/Support/Database.php b/performance/Support/Database.php
new file mode 100644
index 0000000..8162042
--- /dev/null
+++ b/performance/Support/Database.php
@@ -0,0 +1,468 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support;
+
+use Keepsuit\Liquid\Performance\Support\Drops\ArticleDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\CartDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\CollectionDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\ImageDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\LinkDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\MetafieldsDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\PageDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\ProductDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\ShopDrop;
+use Keepsuit\Liquid\Performance\Support\Drops\VariantDrop;
+
+/**
+ * Fixture data for the storefront benchmark theme.
+ *
+ * Two rules govern this class, and both exist to keep the benchmark measuring
+ * the library rather than the fixture. See performance/README.md.
+ *
+ * 1. It assigns, it does not compute. No scans, no reductions, no sorting. Every
+ *    derived value is either stored literally here or exposed as a drop method,
+ *    where it becomes a measured part of template rendering.
+ * 2. Nothing is memoized. Each call builds fresh drops, so #[Cache] starts cold
+ *    on every render and no state is shared between benchmark revolutions.
+ */
+final class Database
+{
+    public const PRODUCTS_PER_PAGE = 24;
+
+    /**
+     * The rows live behind a method rather than a constant on purpose: PHPStan
+     * treats a literal array this large as an `oversized-array` and collapses the
+     * per-key types into one union, whereas it trusts a declared return type.
+     *
+     * @return non-empty-list<array{
+     *     handle: string,
+     *     title: string,
+     *     vendor: string,
+     *     type: string,
+     *     description: string,
+     *     price: int,
+     *     compare_at: int,
+     *     badges: list<string>,
+     *     variants: non-empty-list<array{string, string, string, int, bool}>,
+     *     images: non-empty-list<array{string, string, int, int}>,
+     *     metafields: array<string, string>
+     * }>
+     */
+    private static function productRows(): array
+    {
+        return [
+            [
+                'handle' => 'linen-shirt', 'title' => 'Linen Shirt', 'vendor' => 'ACME Apparel', 'type' => 'Shirts',
+                'description' => 'A relaxed shirt in washed European linen, cut for long warm afternoons.',
+                'price' => 3950, 'compare_at' => 5900, 'badges' => ['new', 'linen'],
+                'variants' => [['linen-shirt-s', 'Small', 'S', 3950, true], ['linen-shirt-m', 'Medium', 'M', 3950, true], ['linen-shirt-l', 'Large', 'L', 4150, false]],
+                'images' => [['/cdn/storefront/linen-shirt-front.jpg', 'Linen Shirt, front', 1200, 1500], ['/cdn/storefront/linen-shirt-detail.jpg', 'Linen Shirt, cuff detail', 1200, 1500]],
+                'metafields' => ['care' => 'Machine wash cold, line dry', 'material' => '100% European linen'],
+            ],
+            [
+                'handle' => 'canvas-tote', 'title' => 'Canvas Tote', 'vendor' => 'Field Goods', 'type' => 'Bags',
+                'description' => 'A wide-mouthed tote in heavy cotton canvas that softens with every trip.',
+                'price' => 2400, 'compare_at' => 3200, 'badges' => ['travel', 'sale'],
+                'variants' => [['canvas-tote-natural', 'Natural', 'Natural', 2400, true], ['canvas-tote-slate', 'Slate', 'Slate', 2400, true], ['canvas-tote-olive', 'Olive', 'Olive', 2600, true]],
+                'images' => [['/cdn/storefront/canvas-tote-front.jpg', 'Canvas Tote, front', 1200, 1200], ['/cdn/storefront/canvas-tote-inside.jpg', 'Canvas Tote, interior', 1200, 1200]],
+                'metafields' => ['care' => 'Spot clean', 'material' => '18oz cotton canvas'],
+            ],
+            [
+                'handle' => 'sun-hat', 'title' => 'Sun Hat', 'vendor' => 'Coastline', 'type' => 'Hats',
+                'description' => 'A packable wide-brim hat woven from paper straw, with a grosgrain band.',
+                'price' => 1875, 'compare_at' => 2500, 'badges' => ['summer', 'sale'],
+                'variants' => [['sun-hat-s', 'Small', 'S', 1875, true], ['sun-hat-m', 'Medium', 'M', 1875, false], ['sun-hat-l', 'Large', 'L', 1875, true]],
+                'images' => [['/cdn/storefront/sun-hat-front.jpg', 'Sun Hat, front', 1000, 1000], ['/cdn/storefront/sun-hat-brim.jpg', 'Sun Hat, brim', 1000, 1000]],
+                'metafields' => ['care' => 'Reshape when damp', 'material' => 'Paper straw, cotton band'],
+            ],
+            [
+                'handle' => 'ceramic-mug', 'title' => 'Ceramic Mug', 'vendor' => 'Studio Form', 'type' => 'Kitchen',
+                'description' => 'A thrown stoneware mug with a matte glaze and a handle that fits four fingers.',
+                'price' => 2200, 'compare_at' => 2200, 'badges' => ['kitchen', 'new'],
+                'variants' => [['ceramic-mug-bone', 'Bone', 'Bone', 2200, true], ['ceramic-mug-ash', 'Ash', 'Ash', 2200, true], ['ceramic-mug-clay', 'Clay', 'Clay', 2400, false]],
+                'images' => [['/cdn/storefront/ceramic-mug-front.jpg', 'Ceramic Mug, front', 1100, 1100], ['/cdn/storefront/ceramic-mug-stack.jpg', 'Ceramic Mug, stacked', 1100, 1100]],
+                'metafields' => ['care' => 'Dishwasher safe', 'material' => 'Glazed stoneware'],
+            ],
+            [
+                'handle' => 'weekend-bag', 'title' => 'Weekend Bag', 'vendor' => 'Field Goods', 'type' => 'Bags',
+                'description' => 'Two nights of luggage with a leather base, brass hardware and a shoulder strap.',
+                'price' => 8900, 'compare_at' => 10900, 'badges' => ['travel', 'limited'],
+                'variants' => [['weekend-bag-tan', 'Tan', 'Tan', 8900, true], ['weekend-bag-black', 'Black', 'Black', 8900, true], ['weekend-bag-navy', 'Navy', 'Navy', 9400, true]],
+                'images' => [['/cdn/storefront/weekend-bag-front.jpg', 'Weekend Bag, front', 1400, 1000], ['/cdn/storefront/weekend-bag-strap.jpg', 'Weekend Bag, strap', 1400, 1000]],
+                'metafields' => ['care' => 'Condition leather twice a year', 'material' => 'Waxed canvas, bridle leather'],
+            ],
+            [
+                'handle' => 'cotton-throw', 'title' => 'Cotton Throw', 'vendor' => 'North Loom', 'type' => 'Home',
+                'description' => 'A loose-woven throw with hand-knotted fringe, warm enough for a cool evening.',
+                'price' => 7600, 'compare_at' => 7600, 'badges' => ['home', 'soft'],
+                'variants' => [['cotton-throw-oat', 'Oat', 'Oat', 7600, true], ['cotton-throw-indigo', 'Indigo', 'Indigo', 7600, false], ['cotton-throw-rust', 'Rust', 'Rust', 7900, true]],
+                'images' => [['/cdn/storefront/cotton-throw-folded.jpg', 'Cotton Throw, folded', 1300, 1000], ['/cdn/storefront/cotton-throw-weave.jpg', 'Cotton Throw, weave', 1300, 1000]],
+                'metafields' => ['care' => 'Wash warm, tumble low', 'material' => 'Organic cotton'],
+            ],
+            [
+                'handle' => 'leather-wallet', 'title' => 'Leather Wallet', 'vendor' => 'Atelier No. 8', 'type' => 'Accessories',
+                'description' => 'Four card slots and a note pocket, cut from a single piece of vegetable-tanned hide.',
+                'price' => 5200, 'compare_at' => 6500, 'badges' => ['gift', 'sale'],
+                'variants' => [['leather-wallet-chestnut', 'Chestnut', 'Chestnut', 5200, true], ['leather-wallet-black', 'Black', 'Black', 5200, true], ['leather-wallet-cognac', 'Cognac', 'Cognac', 5500, true]],
+                'images' => [['/cdn/storefront/leather-wallet-front.jpg', 'Leather Wallet, front', 1000, 800], ['/cdn/storefront/leather-wallet-open.jpg', 'Leather Wallet, open', 1000, 800]],
+                'metafields' => ['care' => 'Keep dry', 'material' => 'Vegetable-tanned leather'],
+            ],
+            [
+                'handle' => 'travel-bottle', 'title' => 'Travel Bottle', 'vendor' => 'Coastline', 'type' => 'Kitchen',
+                'description' => 'A vacuum bottle that keeps coffee hot to the end of a long train ride.',
+                'price' => 2800, 'compare_at' => 2800, 'badges' => ['travel', 'summer'],
+                'variants' => [['travel-bottle-steel', 'Steel', 'Steel', 2800, true], ['travel-bottle-sand', 'Sand', 'Sand', 2800, true], ['travel-bottle-forest', 'Forest', 'Forest', 3000, false]],
+                'images' => [['/cdn/storefront/travel-bottle-front.jpg', 'Travel Bottle, front', 900, 1200], ['/cdn/storefront/travel-bottle-cap.jpg', 'Travel Bottle, cap', 900, 1200]],
+                'metafields' => ['care' => 'Hand wash the lid', 'material' => '18/8 stainless steel'],
+            ],
+            [
+                'handle' => 'desk-lamp', 'title' => 'Desk Lamp', 'vendor' => 'Studio Form', 'type' => 'Lighting',
+                'description' => 'A counterweighted task lamp with a warm dimmable bulb and a fabric cord.',
+                'price' => 6800, 'compare_at' => 8100, 'badges' => ['home', 'new'],
+                'variants' => [['desk-lamp-brass', 'Brass', 'Brass', 6800, true], ['desk-lamp-black', 'Black', 'Black', 6800, true], ['desk-lamp-white', 'White', 'White', 6800, false]],
+                'images' => [['/cdn/storefront/desk-lamp-lit.jpg', 'Desk Lamp, lit', 1200, 1400], ['/cdn/storefront/desk-lamp-arm.jpg', 'Desk Lamp, arm', 1200, 1400]],
+                'metafields' => ['care' => 'Wipe with a dry cloth', 'material' => 'Steel, brass, linen cord'],
+            ],
+            [
+                'handle' => 'wool-socks', 'title' => 'Wool Socks', 'vendor' => 'North Loom', 'type' => 'Socks',
+                'description' => 'Ribbed merino socks with a reinforced heel, warm without the itch.',
+                'price' => 1600, 'compare_at' => 1600, 'badges' => ['warm', 'gift'],
+                'variants' => [['wool-socks-s', 'Small', 'S', 1600, true], ['wool-socks-m', 'Medium', 'M', 1600, true], ['wool-socks-l', 'Large', 'L', 1600, true]],
+                'images' => [['/cdn/storefront/wool-socks-pair.jpg', 'Wool Socks, pair', 1000, 1000], ['/cdn/storefront/wool-socks-rib.jpg', 'Wool Socks, rib', 1000, 1000]],
+                'metafields' => ['care' => 'Wash cool, dry flat', 'material' => 'Merino wool blend'],
+            ],
+            [
+                'handle' => 'market-basket', 'title' => 'Market Basket', 'vendor' => 'Field Goods', 'type' => 'Home',
+                'description' => 'A woven basket with leather handles, sized for a week of vegetables.',
+                'price' => 4300, 'compare_at' => 5000, 'badges' => ['home', 'limited'],
+                'variants' => [['market-basket-small', 'Small', 'Small', 4300, true], ['market-basket-medium', 'Medium', 'Medium', 4700, true], ['market-basket-large', 'Large', 'Large', 5200, false]],
+                'images' => [['/cdn/storefront/market-basket-front.jpg', 'Market Basket, front', 1200, 1200], ['/cdn/storefront/market-basket-handles.jpg', 'Market Basket, handles', 1200, 1200]],
+                'metafields' => ['care' => 'Keep out of direct sun', 'material' => 'Seagrass, leather'],
+            ],
+            [
+                'handle' => 'notebook-set', 'title' => 'Notebook Set', 'vendor' => 'Paper Mill', 'type' => 'Desk',
+                'description' => 'Three saddle-stitched notebooks on paper that takes fountain ink without bleeding.',
+                'price' => 1900, 'compare_at' => 1900, 'badges' => ['desk', 'new'],
+                'variants' => [['notebook-set-ruled', 'Ruled', 'Ruled', 1900, true], ['notebook-set-dotted', 'Dotted', 'Dotted', 1900, true], ['notebook-set-plain', 'Plain', 'Plain', 1900, true]],
+                'images' => [['/cdn/storefront/notebook-set-stack.jpg', 'Notebook Set, stack', 1100, 900], ['/cdn/storefront/notebook-set-open.jpg', 'Notebook Set, open', 1100, 900]],
+                'metafields' => ['care' => 'Keep away from damp', 'material' => '100gsm uncoated paper'],
+            ],
+            [
+                'handle' => 'silk-scarf', 'title' => 'Silk Scarf', 'vendor' => 'Atelier No. 8', 'type' => 'Accessories',
+                'description' => 'A hand-rolled square in heavy silk twill, printed with a coastal map motif.',
+                'price' => 7400, 'compare_at' => 8900, 'badges' => ['gift', 'sale'],
+                'variants' => [['silk-scarf-tide', 'Tide', 'Tide', 7400, true], ['silk-scarf-dune', 'Dune', 'Dune', 7400, false], ['silk-scarf-harbour', 'Harbour', 'Harbour', 7800, true]],
+                'images' => [['/cdn/storefront/silk-scarf-flat.jpg', 'Silk Scarf, flat', 1200, 1200], ['/cdn/storefront/silk-scarf-tied.jpg', 'Silk Scarf, tied', 1200, 1200]],
+                'metafields' => ['care' => 'Dry clean only', 'material' => '100% silk twill'],
+            ],
+            [
+                'handle' => 'beach-towel', 'title' => 'Beach Towel', 'vendor' => 'Coastline', 'type' => 'Home',
+                'description' => 'A flat-woven towel that dries quickly and packs down to nothing.',
+                'price' => 3600, 'compare_at' => 3600, 'badges' => ['summer', 'travel'],
+                'variants' => [['beach-towel-stripe', 'Stripe', 'Stripe', 3600, true], ['beach-towel-solid', 'Solid', 'Solid', 3600, true], ['beach-towel-check', 'Check', 'Check', 3800, true]],
+                'images' => [['/cdn/storefront/beach-towel-folded.jpg', 'Beach Towel, folded', 1300, 900], ['/cdn/storefront/beach-towel-edge.jpg', 'Beach Towel, edge', 1300, 900]],
+                'metafields' => ['care' => 'Wash before first use', 'material' => 'Turkish cotton'],
+            ],
+            [
+                'handle' => 'glass-vase', 'title' => 'Glass Vase', 'vendor' => 'Studio Form', 'type' => 'Home',
+                'description' => 'A hand-blown vase with a heavy base and a neck sized for a single stem.',
+                'price' => 4600, 'compare_at' => 5200, 'badges' => ['home', 'limited'],
+                'variants' => [['glass-vase-clear', 'Clear', 'Clear', 4600, true], ['glass-vase-smoke', 'Smoke', 'Smoke', 4900, true], ['glass-vase-green', 'Green', 'Green', 4900, false]],
+                'images' => [['/cdn/storefront/glass-vase-front.jpg', 'Glass Vase, front', 1000, 1300], ['/cdn/storefront/glass-vase-base.jpg', 'Glass Vase, base', 1000, 1300]],
+                'metafields' => ['care' => 'Hand wash', 'material' => 'Hand-blown glass'],
+            ],
+            [
+                'handle' => 'knit-cap', 'title' => 'Knit Cap', 'vendor' => 'North Loom', 'type' => 'Hats',
+                'description' => 'A close-fitting lambswool cap with a turned brim that sits below the ears.',
+                'price' => 3100, 'compare_at' => 3100, 'badges' => ['warm', 'new'],
+                'variants' => [['knit-cap-charcoal', 'Charcoal', 'Charcoal', 3100, true], ['knit-cap-oat', 'Oat', 'Oat', 3100, true], ['knit-cap-moss', 'Moss', 'Moss', 3100, false]],
+                'images' => [['/cdn/storefront/knit-cap-front.jpg', 'Knit Cap, front', 1000, 1000], ['/cdn/storefront/knit-cap-brim.jpg', 'Knit Cap, brim', 1000, 1000]],
+                'metafields' => ['care' => 'Hand wash cool', 'material' => 'Lambswool'],
+            ],
+            [
+                'handle' => 'key-organizer', 'title' => 'Key Organizer', 'vendor' => 'Atelier No. 8', 'type' => 'Accessories',
+                'description' => 'Holds six keys flat and silent, on a leather strap with a brass rivet.',
+                'price' => 4100, 'compare_at' => 4800, 'badges' => ['gift', 'travel'],
+                'variants' => [['key-organizer-brass', 'Brass', 'Brass', 4100, true], ['key-organizer-steel', 'Steel', 'Steel', 4100, true], ['key-organizer-black', 'Black', 'Black', 4300, true]],
+                'images' => [['/cdn/storefront/key-organizer-front.jpg', 'Key Organizer, front', 900, 900], ['/cdn/storefront/key-organizer-open.jpg', 'Key Organizer, open', 900, 900]],
+                'metafields' => ['care' => 'Tighten the rivet yearly', 'material' => 'Brass, bridle leather'],
+            ],
+            [
+                'handle' => 'picnic-blanket', 'title' => 'Picnic Blanket', 'vendor' => 'Field Goods', 'type' => 'Home',
+                'description' => 'Wool on top, waxed cotton beneath, with straps for carrying it over a shoulder.',
+                'price' => 9200, 'compare_at' => 11200, 'badges' => ['summer', 'home'],
+                'variants' => [['picnic-blanket-check', 'Check', 'Check', 9200, true], ['picnic-blanket-stripe', 'Stripe', 'Stripe', 9200, false], ['picnic-blanket-plain', 'Plain', 'Plain', 9600, true]],
+                'images' => [['/cdn/storefront/picnic-blanket-rolled.jpg', 'Picnic Blanket, rolled', 1300, 1000], ['/cdn/storefront/picnic-blanket-spread.jpg', 'Picnic Blanket, spread', 1300, 1000]],
+                'metafields' => ['care' => 'Brush clean, air dry', 'material' => 'Wool, waxed cotton'],
+            ],
+            [
+                'handle' => 'tea-canister', 'title' => 'Tea Canister', 'vendor' => 'Paper Mill', 'type' => 'Kitchen',
+                'description' => 'An airtight tin with a double lid that keeps loose leaf dry for months.',
+                'price' => 2700, 'compare_at' => 2700, 'badges' => ['kitchen', 'desk'],
+                'variants' => [['tea-canister-small', 'Small', 'Small', 2700, true], ['tea-canister-large', 'Large', 'Large', 3200, true], ['tea-canister-set', 'Set of two', 'Set', 5600, true]],
+                'images' => [['/cdn/storefront/tea-canister-front.jpg', 'Tea Canister, front', 1000, 1200], ['/cdn/storefront/tea-canister-lid.jpg', 'Tea Canister, lid', 1000, 1200]],
+                'metafields' => ['care' => 'Wipe dry before refilling', 'material' => 'Tinplate steel'],
+            ],
+            [
+                'handle' => 'camp-lantern', 'title' => 'Camp Lantern', 'vendor' => 'Coastline', 'type' => 'Lighting',
+                'description' => 'A rechargeable lantern with a warm low setting that runs for forty hours.',
+                'price' => 5400, 'compare_at' => 6200, 'badges' => ['travel', 'limited'],
+                'variants' => [['camp-lantern-sand', 'Sand', 'Sand', 5400, true], ['camp-lantern-slate', 'Slate', 'Slate', 5400, true], ['camp-lantern-red', 'Red', 'Red', 5600, false]],
+                'images' => [['/cdn/storefront/camp-lantern-lit.jpg', 'Camp Lantern, lit', 1000, 1200], ['/cdn/storefront/camp-lantern-handle.jpg', 'Camp Lantern, handle', 1000, 1200]],
+                'metafields' => ['care' => 'Charge every six months', 'material' => 'Aluminium, silicone'],
+            ],
+            [
+                'handle' => 'table-clock', 'title' => 'Table Clock', 'vendor' => 'Studio Form', 'type' => 'Home',
+                'description' => 'A silent-sweep clock with a brushed face and a folded steel stand.',
+                'price' => 5700, 'compare_at' => 5700, 'badges' => ['home', 'desk'],
+                'variants' => [['table-clock-steel', 'Steel', 'Steel', 5700, true], ['table-clock-black', 'Black', 'Black', 5700, true], ['table-clock-brass', 'Brass', 'Brass', 6100, true]],
+                'images' => [['/cdn/storefront/table-clock-front.jpg', 'Table Clock, front', 1100, 1100], ['/cdn/storefront/table-clock-side.jpg', 'Table Clock, side', 1100, 1100]],
+                'metafields' => ['care' => 'One AA battery, not included', 'material' => 'Brushed steel'],
+            ],
+            [
+                'handle' => 'cashmere-wrap', 'title' => 'Cashmere Wrap', 'vendor' => 'North Loom', 'type' => 'Accessories',
+                'description' => 'A generous wrap in two-ply cashmere, light enough to fold into a bag.',
+                'price' => 12800, 'compare_at' => 14900, 'badges' => ['warm', 'gift'],
+                'variants' => [['cashmere-wrap-pearl', 'Pearl', 'Pearl', 12800, true], ['cashmere-wrap-slate', 'Slate', 'Slate', 12800, false], ['cashmere-wrap-camel', 'Camel', 'Camel', 13400, true]],
+                'images' => [['/cdn/storefront/cashmere-wrap-folded.jpg', 'Cashmere Wrap, folded', 1200, 1000], ['/cdn/storefront/cashmere-wrap-worn.jpg', 'Cashmere Wrap, worn', 1200, 1000]],
+                'metafields' => ['care' => 'Hand wash, dry flat', 'material' => 'Two-ply cashmere'],
+            ],
+            [
+                'handle' => 'card-holder', 'title' => 'Card Holder', 'vendor' => 'Atelier No. 8', 'type' => 'Accessories',
+                'description' => 'A slim sleeve for four cards and a folded note, no stitching on the spine.',
+                'price' => 3300, 'compare_at' => 3300, 'badges' => ['gift', 'new'],
+                'variants' => [['card-holder-black', 'Black', 'Black', 3300, true], ['card-holder-tan', 'Tan', 'Tan', 3300, true], ['card-holder-olive', 'Olive', 'Olive', 3500, true]],
+                'images' => [['/cdn/storefront/card-holder-front.jpg', 'Card Holder, front', 900, 700], ['/cdn/storefront/card-holder-side.jpg', 'Card Holder, side', 900, 700]],
+                'metafields' => ['care' => 'Keep dry', 'material' => 'Vegetable-tanned leather'],
+            ],
+            [
+                'handle' => 'sketchbook', 'title' => 'Sketchbook', 'vendor' => 'Paper Mill', 'type' => 'Desk',
+                'description' => 'A lay-flat sketchbook with heavy sized paper that takes a wash without buckling.',
+                'price' => 2500, 'compare_at' => 2500, 'badges' => ['desk', 'travel'],
+                'variants' => [['sketchbook-a5', 'A5', 'A5', 2500, true], ['sketchbook-a4', 'A4', 'A4', 3400, true], ['sketchbook-square', 'Square', 'Square', 2900, false]],
+                'images' => [['/cdn/storefront/sketchbook-cover.jpg', 'Sketchbook, cover', 1000, 1300], ['/cdn/storefront/sketchbook-open.jpg', 'Sketchbook, open', 1000, 1300]],
+                'metafields' => ['care' => 'Store flat', 'material' => '200gsm sized paper'],
+            ],
+        ];
+    }
+
+    /**
+     * @var list<array{title: string, url: string}>
+     */
+    private const MAIN_MENU = [
+        ['title' => 'New arrivals', 'url' => '/collections/new'],
+        ['title' => 'Summer', 'url' => '/collections/summer-essentials'],
+        ['title' => 'Travel', 'url' => '/collections/travel'],
+        ['title' => 'Home', 'url' => '/collections/home'],
+        ['title' => 'Journal', 'url' => '/blogs/journal'],
+    ];
+
+    /**
+     * @var list<array{title: string, url: string}>
+     */
+    private const FOOTER_MENU = [
+        ['title' => 'Shipping', 'url' => '/pages/shipping'],
+        ['title' => 'Returns', 'url' => '/pages/returns'],
+        ['title' => 'Sizing', 'url' => '/pages/sizing'],
+        ['title' => 'Contact', 'url' => '/pages/contact'],
+        ['title' => 'Stockists', 'url' => '/pages/stockists'],
+    ];
+
+    /**
+     * @var list<array{handle: string, title: string, excerpt: string, author: string, published_at: string, reading_minutes: int, tags: list<string>, image: array{string, string, int, int}}>
+     */
+    private const ARTICLES = [
+        [
+            'handle' => 'packing-light', 'title' => 'Packing light for a weekend away',
+            'excerpt' => 'Three small choices that make a two-night trip feel lighter than it is.',
+            'author' => 'Ada Fenn', 'published_at' => '2026-05-14', 'reading_minutes' => 4,
+            'tags' => ['travel', 'guides'],
+            'image' => ['/cdn/storefront/journal-packing.jpg', 'A packed weekend bag', 1400, 900],
+        ],
+        [
+            'handle' => 'choosing-a-daily-carry', 'title' => 'How to choose a daily carry',
+            'excerpt' => 'A practical guide to materials, proportions and the weight you stop noticing.',
+            'author' => 'Ruben Oyelaran', 'published_at' => '2026-04-28', 'reading_minutes' => 6,
+            'tags' => ['bags', 'guides'],
+            'image' => ['/cdn/storefront/journal-carry.jpg', 'A tote on a bench', 1400, 900],
+        ],
+        [
+            'handle' => 'objects-that-earn-their-place', 'title' => 'The objects that earn their place',
+            'excerpt' => 'On buying less, using more, and the quiet test a good object has to pass.',
+            'author' => 'Mira Delacroix', 'published_at' => '2026-04-02', 'reading_minutes' => 5,
+            'tags' => ['essays'],
+            'image' => ['/cdn/storefront/journal-objects.jpg', 'A shelf of everyday objects', 1400, 900],
+        ],
+    ];
+
+    public static function shop(): ShopDrop
+    {
+        return new ShopDrop(
+            name: 'Northstar Goods',
+            domain: 'northstar-goods.example',
+            currency: 'EUR',
+            description: 'Useful objects for slower days, closer places and longer weekends.',
+        );
+    }
+
+    /**
+     * Totals are stored, not summed from line items — see the class docblock.
+     */
+    public static function cart(): CartDrop
+    {
+        return new CartDrop(itemCount: 3, totalPrice: 12650);
+    }
+
+    /**
+     * @return list<LinkDrop>
+     */
+    public static function mainMenu(): array
+    {
+        return self::links(self::MAIN_MENU);
+    }
+
+    /**
+     * @return list<LinkDrop>
+     */
+    public static function footerMenu(): array
+    {
+        return self::links(self::FOOTER_MENU);
+    }
+
+    /**
+     * @return non-empty-list<ProductDrop>
+     */
+    public static function products(): array
+    {
+        return array_map(self::productFromRow(...), self::productRows());
+    }
+
+    /**
+     * @param  array{
+     *     handle: string,
+     *     title: string,
+     *     vendor: string,
+     *     type: string,
+     *     description: string,
+     *     price: int,
+     *     compare_at: int,
+     *     badges: list<string>,
+     *     variants: non-empty-list<array{string, string, string, int, bool}>,
+     *     images: non-empty-list<array{string, string, int, int}>,
+     *     metafields: array<string, string>
+     * }  $row
+     */
+    private static function productFromRow(array $row): ProductDrop
+    {
+        return new ProductDrop(
+            handle: $row['handle'],
+            title: $row['title'],
+            vendor: $row['vendor'],
+            type: $row['type'],
+            description: $row['description'],
+            priceCents: $row['price'],
+            compareAtPriceCents: $row['compare_at'],
+            badges: $row['badges'],
+            images: array_map(self::image(...), $row['images']),
+            variants: array_map(self::variant(...), $row['variants']),
+            metafields: new MetafieldsDrop($row['metafields']),
+        );
+    }
+
+    /**
+     * @param  array{string, string, string, int, bool}  $variant
+     */
+    private static function variant(array $variant): VariantDrop
+    {
+        return new VariantDrop(
+            id: $variant[0],
+            title: $variant[1],
+            option: $variant[2],
+            priceCents: $variant[3],
+            available: $variant[4],
+        );
+    }
+
+    public static function collection(): CollectionDrop
+    {
+        return new CollectionDrop(
+            handle: 'summer-essentials',
+            title: 'Summer Essentials',
+            label: 'summer',
+            description: 'Everyday pieces for long weekends, slow mornings and bright afternoons.',
+            tags: ['New arrivals', 'Travel ready', 'Summer layers', 'Gifts under 100', 'Last few'],
+            products: self::products(),
+            image: self::image(['/cdn/storefront/collection-summer.jpg', 'Summer Essentials', 1600, 900]),
+        );
+    }
+
+    /**
+     * The product page subject. The row index is hard-wired rather than searched,
+     * and only that row is built — returning products()[4] would construct all 24
+     * products, and that cost lands inside the measured region.
+     */
+    public static function product(): ProductDrop
+    {
+        return self::productFromRow(self::productRows()[4]);
+    }
+
+    public static function page(): PageDrop
+    {
+        return new PageDrop(
+            handle: 'our-story',
+            title: 'Our story',
+            content: 'Northstar Goods began with a single canvas bag and a stubborn belief that most things are made too quickly.',
+            sections: [
+                ['title' => 'How we choose makers', 'body' => 'We visit every workshop before we place an order, and we place small orders first.'],
+                ['title' => 'What we will not do', 'body' => 'No seasonal churn, no synthetic linings, and no product we would not use ourselves.'],
+                ['title' => 'Repairs', 'body' => 'Send anything back within five years and we will repair it or replace it.'],
+            ],
+        );
+    }
+
+    /**
+     * @return list<ArticleDrop>
+     */
+    public static function articles(): array
+    {
+        $articles = [];
+
+        foreach (self::ARTICLES as $article) {
+            $articles[] = new ArticleDrop(
+                handle: $article['handle'],
+                title: $article['title'],
+                excerpt: $article['excerpt'],
+                author: $article['author'],
+                publishedAt: $article['published_at'],
+                readingMinutes: $article['reading_minutes'],
+                tags: $article['tags'],
+                image: self::image($article['image']),
+            );
+        }
+
+        return $articles;
+    }
+
+    /**
+     * @param  list<array{title: string, url: string}>  $links
+     * @return list<LinkDrop>
+     */
+    private static function links(array $links): array
+    {
+        $drops = [];
+
+        foreach ($links as $link) {
+            $drops[] = new LinkDrop(title: $link['title'], url: $link['url']);
+        }
+
+        return $drops;
+    }
+
+    /**
+     * @param  array{string, string, int, int}  $image
+     */
+    private static function image(array $image): ImageDrop
+    {
+        return new ImageDrop(src: $image[0], alt: $image[1], width: $image[2], height: $image[3]);
+    }
+}
diff --git a/performance/Support/Drops/ArticleDrop.php b/performance/Support/Drops/ArticleDrop.php
new file mode 100644
index 0000000..620f02f
--- /dev/null
+++ b/performance/Support/Drops/ArticleDrop.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+
+final class ArticleDrop extends Drop
+{
+    /**
+     * @param  list<string>  $tags
+     */
+    public function __construct(
+        public readonly string $handle,
+        public readonly string $title,
+        public readonly string $excerpt,
+        public readonly string $author,
+        public readonly string $publishedAt,
+        public readonly int $readingMinutes,
+        public readonly array $tags,
+        public readonly ImageDrop $image,
+    ) {}
+
+    public function url(): string
+    {
+        return '/blogs/journal/'.$this->handle;
+    }
+}
diff --git a/performance/Support/Drops/CartDrop.php b/performance/Support/Drops/CartDrop.php
new file mode 100644
index 0000000..36a5cdd
--- /dev/null
+++ b/performance/Support/Drops/CartDrop.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+
+/**
+ * Scalars only. The cart earns a drop because the layout header reads it on every
+ * page, but nothing renders line items, so there is no LineItemDrop.
+ *
+ * Totals are stored, not summed: Database assigns, it does not compute.
+ */
+final class CartDrop extends Drop
+{
+    public function __construct(
+        public readonly int $itemCount,
+        public readonly int $totalPrice,
+    ) {}
+
+    public function isEmpty(): bool
+    {
+        return $this->itemCount === 0;
+    }
+}
diff --git a/performance/Support/Drops/CollectionDrop.php b/performance/Support/Drops/CollectionDrop.php
new file mode 100644
index 0000000..2b5dfe4
--- /dev/null
+++ b/performance/Support/Drops/CollectionDrop.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+
+final class CollectionDrop extends Drop
+{
+    /**
+     * @param  list<string>  $tags
+     * @param  list<ProductDrop>  $products
+     */
+    public function __construct(
+        public readonly string $handle,
+        public readonly string $title,
+        public readonly string $label,
+        public readonly string $description,
+        public readonly array $tags,
+        public readonly array $products,
+        public readonly ImageDrop $image,
+    ) {}
+
+    public function url(): string
+    {
+        return '/collections/'.$this->handle;
+    }
+
+    public function productsCount(): int
+    {
+        return count($this->products);
+    }
+}
diff --git a/performance/Support/Drops/ImageDrop.php b/performance/Support/Drops/ImageDrop.php
new file mode 100644
index 0000000..ebbe953
--- /dev/null
+++ b/performance/Support/Drops/ImageDrop.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+
+/**
+ * Stored fields are public typed properties, which resolve through the cheapest
+ * branch of Drop::__get. See performance/README.md for the strategy matrix.
+ */
+final class ImageDrop extends Drop
+{
+    public function __construct(
+        public readonly string $src,
+        public readonly string $alt,
+        public readonly int $width,
+        public readonly int $height,
+    ) {}
+
+    public function aspectRatio(): string
+    {
+        return $this->width.'/'.$this->height;
+    }
+}
diff --git a/performance/Support/Drops/LinkDrop.php b/performance/Support/Drops/LinkDrop.php
new file mode 100644
index 0000000..04f0015
--- /dev/null
+++ b/performance/Support/Drops/LinkDrop.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+
+final class LinkDrop extends Drop
+{
+    public function __construct(
+        public readonly string $title,
+        public readonly string $url,
+    ) {}
+}
diff --git a/performance/Support/Drops/MetafieldsDrop.php b/performance/Support/Drops/MetafieldsDrop.php
new file mode 100644
index 0000000..603792b
--- /dev/null
+++ b/performance/Support/Drops/MetafieldsDrop.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+use Keepsuit\Liquid\Exceptions\UndefinedDropMethodException;
+
+/**
+ * The only drop in the fixture on the liquidMethodMissing path, and the only one
+ * with a real reason to be there: metafield keys are arbitrary strings, so they
+ * cannot be declared as properties up front.
+ *
+ * Templates must only read keys that exist. A miss costs up to three thrown and
+ * caught exceptions inside Drop::__get, and under strictVariables it is an error
+ * the fixture test will fail on.
+ */
+final class MetafieldsDrop extends Drop
+{
+    /**
+     * @param  array<string, string>  $fields
+     */
+    public function __construct(
+        private readonly array $fields,
+    ) {}
+
+    protected function liquidMethodMissing(string $name): mixed
+    {
+        if (array_key_exists($name, $this->fields)) {
+            return $this->fields[$name];
+        }
+
+        throw new UndefinedDropMethodException($name);
+    }
+}
diff --git a/performance/Support/Drops/PageDrop.php b/performance/Support/Drops/PageDrop.php
new file mode 100644
index 0000000..0742ed7
--- /dev/null
+++ b/performance/Support/Drops/PageDrop.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+
+final class PageDrop extends Drop
+{
+    /**
+     * @param  list<array{title: string, body: string}>  $sections
+     */
+    public function __construct(
+        public readonly string $handle,
+        public readonly string $title,
+        public readonly string $content,
+        public readonly array $sections,
+    ) {}
+
+    public function url(): string
+    {
+        return '/pages/'.$this->handle;
+    }
+}
diff --git a/performance/Support/Drops/ProductDrop.php b/performance/Support/Drops/ProductDrop.php
new file mode 100644
index 0000000..f94d698
--- /dev/null
+++ b/performance/Support/Drops/ProductDrop.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Attributes\Cache;
+use Keepsuit\Liquid\Drop;
+
+final class ProductDrop extends Drop
+{
+    /**
+     * @param  list<string>  $badges
+     * @param  non-empty-list<ImageDrop>  $images
+     * @param  non-empty-list<VariantDrop>  $variants
+     */
+    public function __construct(
+        public readonly string $handle,
+        public readonly string $title,
+        public readonly string $vendor,
+        public readonly string $type,
+        public readonly string $description,
+        public readonly int $priceCents,
+        public readonly int $compareAtPriceCents,
+        public readonly array $badges,
+        public readonly array $images,
+        public readonly array $variants,
+        public readonly MetafieldsDrop $metafields,
+    ) {}
+
+    public function url(): string
+    {
+        return '/products/'.$this->handle;
+    }
+
+    public function featuredImage(): ImageDrop
+    {
+        return $this->images[0];
+    }
+
+    public function onSale(): bool
+    {
+        return $this->compareAtPriceCents > $this->priceCents;
+    }
+
+    public function savingCents(): int
+    {
+        return $this->compareAtPriceCents - $this->priceCents;
+    }
+
+    /**
+     * Walks every variant, and is read by the card, the detail panel and the
+     * specs table on the same render — the one place in this fixture where
+     * #[Cache] earns its keep rather than caching a ternary.
+     */
+    #[Cache]
+    public function inStockVariantCount(): int
+    {
+        $count = 0;
+
+        foreach ($this->variants as $variant) {
+            if ($variant->available) {
+                $count++;
+            }
+        }
+
+        return $count;
+    }
+}
diff --git a/performance/Support/Drops/ShopDrop.php b/performance/Support/Drops/ShopDrop.php
new file mode 100644
index 0000000..5c5106f
--- /dev/null
+++ b/performance/Support/Drops/ShopDrop.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+
+final class ShopDrop extends Drop
+{
+    public function __construct(
+        public readonly string $name,
+        public readonly string $domain,
+        public readonly string $currency,
+        public readonly string $description,
+    ) {}
+}
diff --git a/performance/Support/Drops/VariantDrop.php b/performance/Support/Drops/VariantDrop.php
new file mode 100644
index 0000000..f030c3e
--- /dev/null
+++ b/performance/Support/Drops/VariantDrop.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support\Drops;
+
+use Keepsuit\Liquid\Drop;
+
+final class VariantDrop extends Drop
+{
+    public function __construct(
+        public readonly string $id,
+        public readonly string $title,
+        public readonly string $option,
+        public readonly int $priceCents,
+        public readonly bool $available,
+    ) {}
+}
diff --git a/performance/Support/StorefrontFilters.php b/performance/Support/StorefrontFilters.php
new file mode 100644
index 0000000..e5ac727
--- /dev/null
+++ b/performance/Support/StorefrontFilters.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support;
+
+use Keepsuit\Liquid\Filters\FiltersProvider;
+
+/**
+ * Fixture-local filters. Named as a real theme would name them — neither `money`
+ * nor `pluralize` collides with a standard filter, and the templates are supposed
+ * to read like real Liquid.
+ */
+final class StorefrontFilters extends FiltersProvider
+{
+    public function money(int|float $cents): string
+    {
+        return '€'.number_format($cents / 100, 2, '.', '');
+    }
+
+    public function pluralize(int $count, string $singular, string $plural): string
+    {
+        return $count === 1 ? $singular : $plural;
+    }
+}
diff --git a/performance/Support/StorefrontTheme.php b/performance/Support/StorefrontTheme.php
new file mode 100644
index 0000000..09a6f44
--- /dev/null
+++ b/performance/Support/StorefrontTheme.php
@@ -0,0 +1,192 @@
+<?php
+
+namespace Keepsuit\Liquid\Performance\Support;
+
+use Keepsuit\Liquid\Environment;
+use Keepsuit\Liquid\EnvironmentFactory;
+use Keepsuit\Liquid\FileSystems\LocalFileSystem;
+use Keepsuit\Liquid\Render\RenderContext;
+
+/**
+ * Entry point for the storefront benchmark theme.
+ *
+ * Benchmarks build the environment with the library defaults; the fixture test
+ * layers strictVariables, strictFilters and rethrowErrors on top of
+ * environmentFactory(), so a missing variable, a missing filter or a swallowed
+ * render error fails the suite instead of rendering as empty output.
+ */
+final class StorefrontTheme
+{
+    public const LAYOUT_TEMPLATE_NAME = 'layout.theme';
+
+    public const ROOT_TEMPLATE_NAME = 'templates.collection';
+
+    /**
+     * @var list<string>
+     */
+    private const PAGE_TEMPLATE_NAMES = [
+        'templates.index',
+        self::ROOT_TEMPLATE_NAME,
+        'templates.product',
+        'templates.page',
+    ];
+
+    /**
+     * @var list<string>
+     */
+    private const SNIPPET_TEMPLATE_NAMES = [
+        'snippets.shared.site_header',
+        'snippets.shared.site_footer',
+        'snippets.shared.meta_tags',
+        'snippets.shared.breadcrumbs',
+        'snippets.shared.button',
+        'snippets.shared.icon',
+        'snippets.shared.price',
+        'snippets.shared.newsletter',
+        'snippets.collection.header',
+        'snippets.collection.toolbar',
+        'snippets.collection.filters',
+        'snippets.collection.grid',
+        'snippets.index.hero',
+        'snippets.index.featured_products',
+        'snippets.index.journal',
+        'snippets.product.card',
+        'snippets.product.gallery',
+        'snippets.product.pricing',
+        'snippets.product.badges',
+        'snippets.product.variant_picker',
+        'snippets.product.specs',
+        'snippets.product.detail',
+        'snippets.page.header',
+        'snippets.page.content',
+    ];
+
+    public static function themePath(): string
+    {
+        return dirname(__DIR__).'/themes/storefront';
+    }
+
+    public static function environmentFactory(): EnvironmentFactory
+    {
+        return EnvironmentFactory::new()
+            ->setFilesystem(new LocalFileSystem(self::themePath()))
+            ->registerFilters(StorefrontFilters::class);
+    }
+
+    public static function environment(): Environment
+    {
+        return self::environmentFactory()->build();
+    }
+
+    /**
+     * Every template the theme owns: the layout, the page templates and every
+     * snippet. Parsing benchmarks walk this list.
+     *
+     * @return list<string>
+     */
+    public static function templateNames(): array
+    {
+        return [
+            self::LAYOUT_TEMPLATE_NAME,
+            ...self::PAGE_TEMPLATE_NAMES,
+            ...self::SNIPPET_TEMPLATE_NAMES,
+        ];
+    }
+
+    /**
+     * @return list<string>
+     */
+    public static function pageTemplateNames(): array
+    {
+        return self::PAGE_TEMPLATE_NAMES;
+    }
+
+    public static function templatePath(string $templateName): string
+    {
+        return self::themePath().'/'.str_replace('.', '/', $templateName).'.liquid';
+    }
+
+    public static function templateSource(string $templateName): string
+    {
+        $source = file_get_contents(self::templatePath($templateName));
+
+        if ($source === false) {
+            throw new \RuntimeException("Could not read fixture template [$templateName].");
+        }
+
+        return $source;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public static function renderData(string $pageTemplateName = self::ROOT_TEMPLATE_NAME): array
+    {
+        $template = str_replace('templates.', '', $pageTemplateName);
+
+        return [
+            'shop' => Database::shop(),
+            'cart' => Database::cart(),
+            'linklists' => [
+                'main_menu' => Database::mainMenu(),
+                'footer' => Database::footerMenu(),
+            ],
+            'template' => $template,
+            'page_title' => match ($template) {
+                'index' => 'New arrivals',
+                'product' => 'Weekend Bag',
+                'page' => 'Our story',
+                default => 'Summer Essentials',
+            },
+            'collection' => Database::collection(),
+            'product' => Database::product(),
+            'page' => Database::page(),
+            'articles' => Database::articles(),
+            'products_per_page' => Database::PRODUCTS_PER_PAGE,
+        ];
+    }
+
+    public static function newRenderContext(
+        Environment $environment,
+        string $pageTemplateName = self::ROOT_TEMPLATE_NAME,
+    ): RenderContext {
+        return $environment->newRenderContext(staticData: self::renderData($pageTemplateName));
+    }
+
+    public static function newLayoutRenderContext(
+        Environment $environment,
+        mixed $content,
+        string $pageTemplateName = self::ROOT_TEMPLATE_NAME,
+    ): RenderContext {
+        return $environment->newRenderContext(staticData: [
+            ...self::renderData($pageTemplateName),
+            'content_for_layout' => $content,
+        ]);
+    }
+
+    /**
+     * The page renders into its own context, then the layout renders into a second
+     * one. That means the layout cannot see variables the page assigned — nothing
+     * under layout/ may read template-assigned state.
+     */
+    public static function renderPage(Environment $environment, string $pageTemplateName): string
+    {
+        $content = $environment->parseTemplate($pageTemplateName)
+            ->render(self::newRenderContext($environment, $pageTemplateName));
+
+        return $environment->parseTemplate(self::LAYOUT_TEMPLATE_NAME)
+            ->render(self::newLayoutRenderContext($environment, $content, $pageTemplateName));
+    }
+
+    /**
+     * @return \Generator<string>
+     */
+    public static function streamPage(Environment $environment, string $pageTemplateName): \Generator
+    {
+        $content = $environment->parseTemplate($pageTemplateName)
+            ->stream(self::newRenderContext($environment, $pageTemplateName));
+
+        return $environment->parseTemplate(self::LAYOUT_TEMPLATE_NAME)
+            ->stream(self::newLayoutRenderContext($environment, $content, $pageTemplateName));
+    }
+}
diff --git a/performance/benchmarks/OperationBench.php b/performance/benchmarks/OperationBench.php
index fa2b8d0..a02e893 100644
--- a/performance/benchmarks/OperationBench.php
+++ b/performance/benchmarks/OperationBench.php
@@ -4,7 +4,8 @@
 
 use Keepsuit\Liquid\Environment;
 use Keepsuit\Liquid\EnvironmentFactory;
-use Keepsuit\Liquid\Performance\Shopify\DatabaseDrop;
+use Keepsuit\Liquid\Performance\Support\Database;
+use Keepsuit\Liquid\Performance\Support\Drops\ProductDrop;
 use Keepsuit\Liquid\Template;
 use PhpBench\Attributes\BeforeMethods;
 use PhpBench\Attributes\Groups;
@@ -31,6 +32,8 @@ class OperationBench
 
     private Template $filterWithArgumentsTemplate;
 
+    private ProductDrop $productDrop;
+
     public function setUp(): void
     {
         $this->environment = EnvironmentFactory::new()->build();
@@ -38,6 +41,7 @@ public function setUp(): void
         $this->nestedTemplate = $this->environment->parseString(str_repeat('{{ product.title }}', 64));
         $this->filterWithoutArgumentsTemplate = $this->environment->parseString(str_repeat('{{ value | upcase | escape }}', 32));
         $this->filterWithArgumentsTemplate = $this->environment->parseString(str_repeat('{{ value | append: suffix | replace: from, to }}', 32));
+        $this->productDrop = Database::product();
     }
 
     public function benchScalarRender(): void
@@ -71,14 +75,14 @@ public function benchNestedArrayStream(): void
     public function benchDropRender(): void
     {
         $this->nestedTemplate->render($this->environment->newRenderContext(
-            staticData: ['product' => new DatabaseDrop(['title' => 'Product title'])],
+            staticData: ['product' => $this->productDrop],
         ));
     }
 
     public function benchDropStream(): void
     {
         $this->drain($this->nestedTemplate->stream($this->environment->newRenderContext(
-            staticData: ['product' => new DatabaseDrop(['title' => 'Product title'])],
+            staticData: ['product' => $this->productDrop],
         )));
     }
 
diff --git a/performance/benchmarks/Support/ComplexThemeFixture.php b/performance/benchmarks/Support/ComplexThemeFixture.php
deleted file mode 100644
index 3898012..0000000
--- a/performance/benchmarks/Support/ComplexThemeFixture.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-
-namespace Keepsuit\Liquid\Performance\benchmarks\Support;
-
-use Keepsuit\Liquid\Attributes\Cache;
-use Keepsuit\Liquid\Contracts\LiquidTemplatesCache;
-use Keepsuit\Liquid\Drop;
-use Keepsuit\Liquid\Environment;
-use Keepsuit\Liquid\EnvironmentFactory;
-use Keepsuit\Liquid\FileSystems\LocalFileSystem;
-use Keepsuit\Liquid\Filters\FiltersProvider;
-use Keepsuit\Liquid\Render\RenderContext;
-
-final class ComplexThemeFixture
-{
-    public const ROOT_TEMPLATE_NAME = 'templates.collection';
-
-    public const LAYOUT_TEMPLATE_NAME = 'layout.theme';
-
-    private const PAGE_TEMPLATE_NAMES = [
-        'templates.index',
-        self::ROOT_TEMPLATE_NAME,
-        'templates.product',
-        'templates.page',
-    ];
-
-    private const PRODUCTS = [
-        ['linen-shirt', 'Linen Shirt', 'ACME Apparel', 3950, 5900, ['new', 'linen']],
-        ['canvas-tote', 'Canvas Tote', 'Field Goods', 2400, 3200, ['travel', 'sale']],
-        ['sun-hat', 'Sun Hat', 'Coastline', 1875, 2500, ['summer', 'sale']],
-        ['ceramic-mug', 'Ceramic Mug', 'Studio Form', 2200, 2200, ['kitchen', 'new']],
-        ['weekend-bag', 'Weekend Bag', 'Field Goods', 8900, 10900, ['travel', 'limited']],
-        ['cotton-throw', 'Cotton Throw', 'North Loom', 7600, 7600, ['home', 'soft']],
-        ['leather-wallet', 'Leather Wallet', 'Atelier No. 8', 5200, 6500, ['gift', 'sale']],
-        ['travel-bottle', 'Travel Bottle', 'Coastline', 2800, 2800, ['travel', 'summer']],
-        ['desk-lamp', 'Desk Lamp', 'Studio Form', 6800, 8100, ['home', 'new']],
-        ['wool-socks', 'Wool Socks', 'North Loom', 1600, 1600, ['warm', 'gift']],
-        ['market-basket', 'Market Basket', 'Field Goods', 4300, 5000, ['home', 'limited']],
-        ['notebook-set', 'Notebook Set', 'Paper Mill', 1900, 1900, ['desk', 'new']],
-        ['silk-scarf', 'Silk Scarf', 'Atelier No. 8', 7400, 8900, ['gift', 'sale']],
-        ['beach-towel', 'Beach Towel', 'Coastline', 3600, 3600, ['summer', 'travel']],
-        ['glass-vase', 'Glass Vase', 'Studio Form', 4600, 5200, ['home', 'limited']],
-        ['knit-cap', 'Knit Cap', 'North Loom', 3100, 3100, ['warm', 'new']],
-        ['key-organizer', 'Key Organizer', 'Atelier No. 8', 4100, 4800, ['gift', 'travel']],
-        ['picnic-blanket', 'Picnic Blanket', 'Field Goods', 9200, 11200, ['summer', 'home']],
-        ['tea-canister', 'Tea Canister', 'Paper Mill', 2700, 2700, ['kitchen', 'desk']],
-        ['camp-lantern', 'Camp Lantern', 'Coastline', 5400, 6200, ['travel', 'limited']],
-        ['table-clock', 'Table Clock', 'Studio Form', 5700, 5700, ['home', 'desk']],
-        ['cashmere-wrap', 'Cashmere Wrap', 'North Loom', 12800, 14900, ['warm', 'gift']],
-        ['card-holder', 'Card Holder', 'Atelier No. 8', 3300, 3300, ['gift', 'new']],
-        ['sketchbook', 'Sketchbook', 'Paper Mill', 2500, 2500, ['desk', 'travel']],
-    ];
-
-    public static function environment(?LiquidTemplatesCache $templatesCache = null): Environment
-    {
-        $factory = EnvironmentFactory::new()
-            ->setFilesystem(new LocalFileSystem(self::themePath()))
-            ->registerFilters(ComplexThemeFilters::class);
-
-        if ($templatesCache !== null) {
-            $factory->setTemplatesCache($templatesCache);
-        }
-
-        return $factory->build();
-    }
-
-    public static function themePath(): string
-    {
-        return dirname(__DIR__, 2).'/themes/complex-collection';
-    }
-
-    public static function rootTemplateName(): string
-    {
-        return self::ROOT_TEMPLATE_NAME;
-    }
-
-    /**
-     * @return list<string>
-     */
-    public static function templateNames(): array
-    {
-        return [
-            self::LAYOUT_TEMPLATE_NAME,
-            ...self::PAGE_TEMPLATE_NAMES,
-            'snippets.shared.site_header',
-            'snippets.shared.site_footer',
-            'snippets.shared.button',
-            'snippets.shared.icon',
-            'snippets.shared.price',
-            'snippets.collection.header',
-            'snippets.collection.navigation',
-            'snippets.collection.grid',
-            'snippets.index.hero',
-            'snippets.index.featured_products',
-            'snippets.index.journal',
-            'snippets.product.card',
-            'snippets.product.media',
-            'snippets.product.pricing',
-            'snippets.product.metadata',
-            'snippets.product.detail',
-            'snippets.page.header',
-            'snippets.page.content',
-        ];
-    }
-
-    /**
-     * @return list<string>
-     */
-    public static function pageTemplateNames(): array
-    {
-        return self::PAGE_TEMPLATE_NAMES;
-    }
-
-    public static function templateSource(string $templateName): string
-    {
-        $source = file_get_contents(self::templatePath($templateName));
-
-        if ($source === false) {
-            throw new \RuntimeException("Could not read fixture template [$templateName].");
-        }
-
-        return $source;
-    }
-
-    public static function templatePath(string $templateName): string
-    {
-        return self::themePath().'/'.str_replace('.', '/', $templateName).'.liquid';
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public static function renderData(string $pageTemplateName = self::ROOT_TEMPLATE_NAME): array
-    {
-        $products = array_map(
-            static fn (array $product) => new ComplexThemeProduct(...$product),
-            self::PRODUCTS,
-        );
-
-        $pageType = str_replace('templates.', '', $pageTemplateName);
-
-        return [
-            'shop' => [
-                'name' => 'Northstar Goods',
-                'currency' => 'EUR',
-            ],
-            'cart' => [
-                'item_count' => 3,
-                'total_price' => 12650,
-            ],
-            'linklists' => [
-                'main-menu' => [
-                    'links' => [
-                        ['url' => '/collections/summer-essentials', 'title' => 'Summer'],
-                        ['url' => '/collections/travel', 'title' => 'Travel'],
-                        ['url' => '/collections/home', 'title' => 'Home'],
-                    ],
-                ],
-                'footer' => [
-                    'links' => [
-                        ['url' => '/pages/shipping', 'title' => 'Shipping'],
-                        ['url' => '/pages/returns', 'title' => 'Returns'],
-                        ['url' => '/pages/contact', 'title' => 'Contact'],
-                    ],
-                ],
-            ],
-            'page_title' => match ($pageType) {
-                'index' => 'New arrivals',
-                'product' => 'Weekend Bag',
-                'page' => 'Our story',
-                default => 'Summer Essentials',
-            },
-            'template' => $pageType,
-            'collection' => [
-                'handle' => 'summer-essentials',
-                'title' => 'Summer Essentials',
-                'label' => 'summer',
-                'description' => 'Everyday pieces for long weekends, slow mornings, and bright afternoons.',
-                'tags' => ['New arrivals', 'Travel ready', 'Summer layers', 'Gifts under €100'],
-                'products' => $products,
-            ],
-            'product' => $products[4],
-            'page' => [
-                'title' => 'Our story',
-                'content' => 'Northstar Goods makes useful objects for slower days, closer places, and longer weekends.',
-            ],
-            'articles' => [
-                ['title' => 'Packing light for a weekend away', 'excerpt' => 'Three small choices that make travel easier.'],
-                ['title' => 'How to choose a daily carry', 'excerpt' => 'A practical guide to materials and proportions.'],
-                ['title' => 'The objects that earn their place', 'excerpt' => 'On buying less and using more.'],
-            ],
-        ];
-    }
-
-    public static function newRenderContext(
-        Environment $environment,
-        string $pageTemplateName = self::ROOT_TEMPLATE_NAME,
-    ): RenderContext {
-        return $environment->newRenderContext(staticData: self::renderData($pageTemplateName));
-    }
-
-    public static function newLayoutRenderContext(
-        Environment $environment,
-        mixed $content,
-        string $pageTemplateName = self::ROOT_TEMPLATE_NAME,
-    ): RenderContext {
-        return $environment->newRenderContext(staticData: [
-            ...self::renderData($pageTemplateName),
-            'content_for_layout' => $content,
-        ]);
-    }
-
-    public static function renderPage(Environment $environment, string $pageTemplateName): string
-    {
-        $content = $environment->parseTemplate($pageTemplateName)
-            ->render(self::newRenderContext($environment, $pageTemplateName));
-
-        return $environment->parseTemplate(self::LAYOUT_TEMPLATE_NAME)
-            ->render(self::newLayoutRenderContext($environment, $content, $pageTemplateName));
-    }
-
-    /**
-     * @return \Generator<string>
-     */
-    public static function streamPage(Environment $environment, string $pageTemplateName): \Generator
-    {
-        $content = $environment->parseTemplate($pageTemplateName)
-            ->stream(self::newRenderContext($environment, $pageTemplateName));
-
-        return $environment->parseTemplate(self::LAYOUT_TEMPLATE_NAME)
-            ->stream(self::newLayoutRenderContext($environment, $content, $pageTemplateName));
-    }
-}
-
-final class ComplexThemeFilters extends FiltersProvider
-{
-    public function fixtureMoney(int|float $cents): string
-    {
-        return '€'.number_format($cents / 100, 2, '.', '');
-    }
-
-    public function fixturePluralize(int $count, string $singular, string $plural): string
-    {
-        return $count === 1 ? $singular : $plural;
-    }
-}
-
-final class ComplexThemeProduct extends Drop
-{
-    /**
-     * @param  list<string>  $badges
-     */
-    public function __construct(
-        public readonly string $handle,
-        public readonly string $title,
-        private readonly string $vendorName,
-        private readonly int $priceCents,
-        private readonly int $compareAtPriceCents,
-        public readonly array $badges,
-    ) {}
-
-    public function vendor(): string
-    {
-        return $this->vendorName;
-    }
-
-    public function priceCents(): int
-    {
-        return $this->priceCents;
-    }
-
-    public function compareAtPriceCents(): int
-    {
-        return $this->compareAtPriceCents;
-    }
-
-    #[Cache]
-    public function inventoryLabel(): string
-    {
-        return $this->priceCents < 3000 ? 'Low stock' : 'In stock';
-    }
-}
diff --git a/performance/benchmarks/TemplateCacheBench.php b/performance/benchmarks/TemplateCacheBench.php
index 5c0c479..a068144 100644
--- a/performance/benchmarks/TemplateCacheBench.php
+++ b/performance/benchmarks/TemplateCacheBench.php
@@ -4,7 +4,7 @@
 
 use Keepsuit\Liquid\Contracts\LiquidTemplatesCache;
 use Keepsuit\Liquid\Environment;
-use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
+use Keepsuit\Liquid\Performance\Support\StorefrontTheme;
 use Keepsuit\Liquid\TemplatesCache\MemoryTemplatesCache;
 use Keepsuit\Liquid\TemplatesCache\SerializeTemplatesCache;
 use Keepsuit\Liquid\TemplatesCache\VarExportTemplatesCache;
@@ -105,7 +105,7 @@ private function setUpBuild(string $backend): void
     {
         $this->cache = $this->newCache($backend);
         $this->cache->clear();
-        $this->environment = ComplexThemeFixture::environment($this->cache);
+        $this->environment = StorefrontTheme::environmentFactory()->setTemplatesCache($this->cache)->build();
     }
 
     private function setUpCachedRender(string $backend): void
@@ -116,12 +116,12 @@ private function setUpCachedRender(string $backend): void
         $this->cache = $backend === 'memory'
             ? $this->cache
             : $this->newCache($backend);
-        $this->environment = ComplexThemeFixture::environment($this->cache);
+        $this->environment = StorefrontTheme::environmentFactory()->setTemplatesCache($this->cache)->build();
     }
 
     private function compileStaticTheme(Environment $environment): void
     {
-        foreach (ComplexThemeFixture::templateNames() as $templateName) {
+        foreach (StorefrontTheme::templateNames() as $templateName) {
             $environment->parseTemplate($templateName);
         }
     }
@@ -134,8 +134,8 @@ private function buildStaticTheme(): void
 
     private function renderCachedTheme(): void
     {
-        foreach (ComplexThemeFixture::pageTemplateNames() as $templateName) {
-            ComplexThemeFixture::renderPage($this->environment, $templateName);
+        foreach (StorefrontTheme::pageTemplateNames() as $templateName) {
+            StorefrontTheme::renderPage($this->environment, $templateName);
         }
     }
 
diff --git a/performance/benchmarks/ThemeBench.php b/performance/benchmarks/ThemeBench.php
index 786cedb..c06b8fa 100644
--- a/performance/benchmarks/ThemeBench.php
+++ b/performance/benchmarks/ThemeBench.php
@@ -3,7 +3,7 @@
 namespace Keepsuit\Liquid\Performance\benchmarks;
 
 use Keepsuit\Liquid\Environment;
-use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
+use Keepsuit\Liquid\Performance\Support\StorefrontTheme;
 use PhpBench\Attributes\BeforeMethods;
 use PhpBench\Attributes\Groups;
 use PhpBench\Attributes\Iterations;
@@ -11,6 +11,17 @@
 use PhpBench\Attributes\OutputTimeUnit;
 use PhpBench\Attributes\Revs;
 
+/**
+ * Whole-pipeline canary for the storefront theme.
+ *
+ * This class answers "did rendering get slower", not "what got slower": it
+ * averages 29 templates across four pages, so it cannot localize a regression.
+ * Per-feature sensitivity belongs in the micro group.
+ *
+ * ponytail: the micro group has not caught up yet, so nothing in the suite
+ * isolates a single tag, the drop miss path, or superlinear growth. The deferred
+ * list is in performance/README.md.
+ */
 #[Groups(['macro'])]
 #[Iterations(10)]
 #[Revs(20)]
@@ -22,8 +33,8 @@ class ThemeBench
     private Environment $environment;
 
     /**
-     * Template sources are read up front: reading them inside the benchmark
-     * would measure the filesystem instead of the tokenizer and the parser.
+     * Sources are read up front: reading them inside a benchmark would measure
+     * the filesystem instead of the tokenizer and the parser.
      *
      * @var array<string, string>
      */
@@ -31,12 +42,12 @@ class ThemeBench
 
     public function setUp(): void
     {
-        $this->environment = ComplexThemeFixture::environment();
+        $this->environment = StorefrontTheme::environment();
         $this->sources = [];
 
-        foreach (ComplexThemeFixture::templateNames() as $name) {
+        foreach (StorefrontTheme::templateNames() as $name) {
             $this->environment->parseTemplate($name);
-            $this->sources[$name] = ComplexThemeFixture::templateSource($name);
+            $this->sources[$name] = StorefrontTheme::templateSource($name);
         }
     }
 
@@ -56,15 +67,15 @@ public function benchParse(): void
 
     public function benchRender(): void
     {
-        foreach (ComplexThemeFixture::pageTemplateNames() as $templateName) {
-            ComplexThemeFixture::renderPage($this->environment, $templateName);
+        foreach (StorefrontTheme::pageTemplateNames() as $pageTemplateName) {
+            StorefrontTheme::renderPage($this->environment, $pageTemplateName);
         }
     }
 
     public function benchStream(): void
     {
-        foreach (ComplexThemeFixture::pageTemplateNames() as $templateName) {
-            foreach (ComplexThemeFixture::streamPage($this->environment, $templateName) as $chunk) {
+        foreach (StorefrontTheme::pageTemplateNames() as $pageTemplateName) {
+            foreach (StorefrontTheme::streamPage($this->environment, $pageTemplateName) as $chunk) {
             }
         }
     }
diff --git a/performance/profile-theme.php b/performance/profile-theme.php
index f33de4f..2afcaa7 100644
--- a/performance/profile-theme.php
+++ b/performance/profile-theme.php
@@ -1,8 +1,8 @@
 <?php
 
 use Keepsuit\Liquid\Extensions\ProfilerExtension;
-use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
 use Keepsuit\Liquid\Performance\ProfileReport;
+use Keepsuit\Liquid\Performance\Support\StorefrontTheme;
 use Keepsuit\Liquid\Profiler\Profiler;
 
 require dirname(__DIR__).'/vendor/autoload.php';
@@ -33,15 +33,15 @@
     }
 }
 
-$environment = ComplexThemeFixture::environment();
+$environment = StorefrontTheme::environment();
 $environment->addExtension(new ProfilerExtension(
     profiler: $profiler = new Profiler,
     tags: true,
     variables: true,
 ));
 
-foreach (ComplexThemeFixture::pageTemplateNames() as $templateName) {
-    ComplexThemeFixture::renderPage($environment, $templateName);
+foreach (StorefrontTheme::pageTemplateNames() as $templateName) {
+    StorefrontTheme::renderPage($environment, $templateName);
 }
 
 $report = ProfileReport::fromProfiler($profiler);
diff --git a/performance/themes/complex-collection/layout/theme.liquid b/performance/themes/complex-collection/layout/theme.liquid
deleted file mode 100644
index 095043a..0000000
--- a/performance/themes/complex-collection/layout/theme.liquid
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <title>{{ shop.name }} &mdash; {{ page_title }}</title>
-  <meta charset="utf-8">
-</head>
-<body id="page-{{ template }}">
-  {% render "snippets.shared.site_header", shop: shop, cart: cart, links: linklists.main-menu.links %}
-  {{ content_for_layout }}
-  {% render "snippets.shared.site_footer", shop: shop, links: linklists.footer.links %}
-</body>
-</html>
diff --git a/performance/themes/complex-collection/snippets/collection/grid.liquid b/performance/themes/complex-collection/snippets/collection/grid.liquid
deleted file mode 100644
index d575a56..0000000
--- a/performance/themes/complex-collection/snippets/collection/grid.liquid
+++ /dev/null
@@ -1,3 +0,0 @@
-<section class="products" data-count="{{ collection.products | size }}">
-{% for product in collection.products %}  {% render "snippets.product.card", product: product, label: collection.label, position: forloop.index %}
-{% endfor %}</section>
diff --git a/performance/themes/complex-collection/snippets/collection/header.liquid b/performance/themes/complex-collection/snippets/collection/header.liquid
deleted file mode 100644
index 9bc83bd..0000000
--- a/performance/themes/complex-collection/snippets/collection/header.liquid
+++ /dev/null
@@ -1,7 +0,0 @@
-<header class="collection-header">
-  <p class="eyebrow">{{ collection.label | upcase | append: " collection" }}</p>
-  <h1>{{ collection.title }}</h1>
-  <p>{{ collection.description }}</p>
-  <p class="count">{{ collection.products | size }} products selected</p>
-  {% render "snippets.shared.button", label: "Shop all arrivals", url: "/collections/summer-essentials", icon: "arrow", tone: "primary" %}
-</header>
diff --git a/performance/themes/complex-collection/snippets/collection/navigation.liquid b/performance/themes/complex-collection/snippets/collection/navigation.liquid
deleted file mode 100644
index 7ebdacf..0000000
--- a/performance/themes/complex-collection/snippets/collection/navigation.liquid
+++ /dev/null
@@ -1,6 +0,0 @@
-<nav aria-label="Collection filters" class="collection-navigation">
-  <p>{% render "snippets.shared.icon", name: "filter" %} Filter by</p>
-  <ul>{% for tag in collection.tags %}
-    <li data-position="{{ forloop.index }}">{{ tag | replace: " ", "-" | upcase }}</li>{% endfor %}
-  </ul>
-</nav>
diff --git a/performance/themes/complex-collection/snippets/index/featured_products.liquid b/performance/themes/complex-collection/snippets/index/featured_products.liquid
deleted file mode 100644
index 3868294..0000000
--- a/performance/themes/complex-collection/snippets/index/featured_products.liquid
+++ /dev/null
@@ -1,6 +0,0 @@
-<section class="featured-products">
-  <header><p class="eyebrow">Editor’s picks</p><h2>Useful things for every day</h2></header>
-  <div class="featured-products__grid">
-{% for product in collection.products limit: 6 %}    {% render "snippets.product.card", product: product, label: "featured", position: forloop.index %}
-{% endfor %}  </div>
-</section>
diff --git a/performance/themes/complex-collection/snippets/index/hero.liquid b/performance/themes/complex-collection/snippets/index/hero.liquid
deleted file mode 100644
index 1b60169..0000000
--- a/performance/themes/complex-collection/snippets/index/hero.liquid
+++ /dev/null
@@ -1,6 +0,0 @@
-<section class="home-hero">
-  <p class="eyebrow">Field notes / {{ collection.label | upcase }}</p>
-  <h1>{{ collection.title }}</h1>
-  <p>{{ collection.description }}</p>
-  {% render "snippets.shared.button", label: "Explore the collection", url: "/collections/summer-essentials", icon: "arrow", tone: "primary" %}
-</section>
diff --git a/performance/themes/complex-collection/snippets/index/journal.liquid b/performance/themes/complex-collection/snippets/index/journal.liquid
deleted file mode 100644
index 9ce3c3d..0000000
--- a/performance/themes/complex-collection/snippets/index/journal.liquid
+++ /dev/null
@@ -1,6 +0,0 @@
-<section class="journal-preview">
-  <header><p class="eyebrow">From the journal</p><h2>Better everyday rituals</h2></header>
-  <div class="journal-preview__entries">
-{% for article in articles %}    <article><h3>{{ article.title }}</h3><p>{{ article.excerpt }}</p>{% render "snippets.shared.button", label: "Read article", url: "/blogs/journal", icon: "arrow", tone: "text" %}</article>
-{% endfor %}  </div>
-</section>
diff --git a/performance/themes/complex-collection/snippets/page/content.liquid b/performance/themes/complex-collection/snippets/page/content.liquid
deleted file mode 100644
index d777473..0000000
--- a/performance/themes/complex-collection/snippets/page/content.liquid
+++ /dev/null
@@ -1,4 +0,0 @@
-<article class="content-page__body">
-  <p>{{ page.content }}</p>
-  {% render "snippets.shared.button", label: "Contact us", url: "/pages/contact", icon: "arrow", tone: "secondary" %}
-</article>
diff --git a/performance/themes/complex-collection/snippets/page/header.liquid b/performance/themes/complex-collection/snippets/page/header.liquid
deleted file mode 100644
index cc162b5..0000000
--- a/performance/themes/complex-collection/snippets/page/header.liquid
+++ /dev/null
@@ -1,4 +0,0 @@
-<header class="content-page__header">
-  <p class="eyebrow">{% render "snippets.shared.icon", name: "arrow" %} Northstar journal</p>
-  <h1>{{ page.title }}</h1>
-</header>
diff --git a/performance/themes/complex-collection/snippets/product/card.liquid b/performance/themes/complex-collection/snippets/product/card.liquid
deleted file mode 100644
index 6251020..0000000
--- a/performance/themes/complex-collection/snippets/product/card.liquid
+++ /dev/null
@@ -1,9 +0,0 @@
-<article data-handle="{{ product.handle }}" data-position="{{ position }}" class="product-card">
-  {% render "snippets.product.media", product: product %}
-  <div class="product-card__details">
-    <p class="product-card__vendor">{{ product.vendor | upcase }}</p>
-    <h2>{{ product.title }}</h2>
-    {% render "snippets.product.pricing", product: product %}
-    {% render "snippets.product.metadata", product: product, label: label %}
-  </div>
-</article>
diff --git a/performance/themes/complex-collection/snippets/product/detail.liquid b/performance/themes/complex-collection/snippets/product/detail.liquid
deleted file mode 100644
index f3b9a88..0000000
--- a/performance/themes/complex-collection/snippets/product/detail.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-<article class="product-detail">
-  {% render "snippets.product.media", product: product %}
-  <div class="product-detail__content">
-    <p class="eyebrow">{{ product.vendor | upcase }}</p>
-    <h1>{{ product.title }}</h1>
-    {% render "snippets.product.pricing", product: product %}
-    {% render "snippets.product.metadata", product: product, label: "featured item" %}
-    {% render "snippets.shared.button", label: "Add to cart", url: "/cart/add", icon: "bag", tone: "primary" %}
-  </div>
-</article>
diff --git a/performance/themes/complex-collection/snippets/product/media.liquid b/performance/themes/complex-collection/snippets/product/media.liquid
deleted file mode 100644
index 3a073a6..0000000
--- a/performance/themes/complex-collection/snippets/product/media.liquid
+++ /dev/null
@@ -1,4 +0,0 @@
-<figure class="product-card__media" data-image="{{ product.handle | append: "-image" }}">
-  <img alt="{{ product.title | escape }}" src="/images/{{ product.handle }}.jpg">
-  <figcaption>{{ product.title }} by {{ product.vendor }}</figcaption>
-</figure>
diff --git a/performance/themes/complex-collection/snippets/product/metadata.liquid b/performance/themes/complex-collection/snippets/product/metadata.liquid
deleted file mode 100644
index c7d125d..0000000
--- a/performance/themes/complex-collection/snippets/product/metadata.liquid
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="product-card__metadata">
-  <p class="label">{{ label }}</p>
-  <p class="inventory">{{ product.inventory_label }} / {{ product.inventory_label }}</p>
-  <ul class="badges">
-{% for badge in product.badges %}    <li>{{ badge | upcase }}</li>
-{% endfor %}  </ul>
-  <p class="summary">{{ product.title }} / {{ product.vendor }} / {{ product.inventory_label }} | {{ product.title }} / {{ product.vendor }} / {{ product.inventory_label }}</p>
-</div>
diff --git a/performance/themes/complex-collection/snippets/product/pricing.liquid b/performance/themes/complex-collection/snippets/product/pricing.liquid
deleted file mode 100644
index 59ebdbd..0000000
--- a/performance/themes/complex-collection/snippets/product/pricing.liquid
+++ /dev/null
@@ -1,5 +0,0 @@
-<p class="product-card__pricing">
-  {% render "snippets.shared.price", cents: product.price_cents %}
-  {% if product.compare_at_price_cents > product.price_cents %}<s>{% render "snippets.shared.price", cents: product.compare_at_price_cents %}</s>{% endif %}
-  <span class="saving">{{ product.compare_at_price_cents | minus: product.price_cents | fixture_money }}</span>
-</p>
diff --git a/performance/themes/complex-collection/snippets/shared/button.liquid b/performance/themes/complex-collection/snippets/shared/button.liquid
deleted file mode 100644
index f8724ec..0000000
--- a/performance/themes/complex-collection/snippets/shared/button.liquid
+++ /dev/null
@@ -1 +0,0 @@
-<a class="button button--{{ tone }}" href="{{ url }}">{% render "snippets.shared.icon", name: icon %}{{ label }}</a>
diff --git a/performance/themes/complex-collection/snippets/shared/icon.liquid b/performance/themes/complex-collection/snippets/shared/icon.liquid
deleted file mode 100644
index 81b4ff2..0000000
--- a/performance/themes/complex-collection/snippets/shared/icon.liquid
+++ /dev/null
@@ -1,3 +0,0 @@
-{% if name == "arrow" %}<svg aria-hidden="true" class="icon icon--arrow" viewBox="0 0 12 12"><path d="M1 6h9M7 2l4 4-4 4"/></svg>{% endif %}
-{% if name == "bag" %}<svg aria-hidden="true" class="icon icon--bag" viewBox="0 0 12 12"><path d="M2 4h8l-1 7H3L2 4zm2 0a2 2 0 014 0"/></svg>{% endif %}
-{% if name == "filter" %}<svg aria-hidden="true" class="icon icon--filter" viewBox="0 0 12 12"><path d="M1 2h10L7 7v3l-2 1V7L1 2z"/></svg>{% endif %}
diff --git a/performance/themes/complex-collection/snippets/shared/price.liquid b/performance/themes/complex-collection/snippets/shared/price.liquid
deleted file mode 100644
index 296b1f8..0000000
--- a/performance/themes/complex-collection/snippets/shared/price.liquid
+++ /dev/null
@@ -1 +0,0 @@
-<span class="price">{{ cents | fixture_money }}</span>
diff --git a/performance/themes/complex-collection/snippets/shared/site_footer.liquid b/performance/themes/complex-collection/snippets/shared/site_footer.liquid
deleted file mode 100644
index 2b2b7c9..0000000
--- a/performance/themes/complex-collection/snippets/shared/site_footer.liquid
+++ /dev/null
@@ -1,6 +0,0 @@
-<footer class="site-footer">
-  <p>All prices are in {{ shop.currency }}.</p>
-  <nav aria-label="Footer navigation">{% for link in links %}
-    <a href="{{ link.url }}">{{ link.title }}</a>{% unless forloop.last %} / {% endunless %}{% endfor %}
-  </nav>
-</footer>
diff --git a/performance/themes/complex-collection/snippets/shared/site_header.liquid b/performance/themes/complex-collection/snippets/shared/site_header.liquid
deleted file mode 100644
index f21b740..0000000
--- a/performance/themes/complex-collection/snippets/shared/site_header.liquid
+++ /dev/null
@@ -1,9 +0,0 @@
-<header class="site-header">
-  <a href="/" class="site-header__brand">{{ shop.name }}</a>
-  <nav aria-label="Main navigation">
-    <ul>{% for link in links %}
-      <li><a href="{{ link.url }}">{{ link.title }}</a></li>{% endfor %}
-    </ul>
-  </nav>
-  <p class="site-header__cart">{% render "snippets.shared.icon", name: "bag" %} Cart: {{ cart.item_count }} {{ cart.item_count | fixture_pluralize: 'item', 'items' }} / {{ cart.total_price | fixture_money }}</p>
-</header>
diff --git a/performance/themes/complex-collection/templates/collection.liquid b/performance/themes/complex-collection/templates/collection.liquid
deleted file mode 100644
index aba3ae6..0000000
--- a/performance/themes/complex-collection/templates/collection.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-{% assign product_count = collection.products | size %}
-{% if product_count > 0 %}
-<main data-collection="{{ collection.handle }}" class="collection-page">
-  {% render "snippets.collection.header", collection: collection %}
-  {% render "snippets.collection.navigation", collection: collection %}
-  {% render "snippets.collection.grid", collection: collection %}
-</main>
-{% else %}
-<main class="collection-page"><p class="collection-page__empty">No products found in this collection.</p></main>
-{% endif %}
diff --git a/performance/themes/complex-collection/templates/index.liquid b/performance/themes/complex-collection/templates/index.liquid
deleted file mode 100644
index 6b019cf..0000000
--- a/performance/themes/complex-collection/templates/index.liquid
+++ /dev/null
@@ -1,5 +0,0 @@
-<main class="home-page">
-  {% render "snippets.index.hero", collection: collection %}
-  {% render "snippets.index.featured_products", collection: collection %}
-  {% render "snippets.index.journal", articles: articles %}
-</main>
diff --git a/performance/themes/complex-collection/templates/page.liquid b/performance/themes/complex-collection/templates/page.liquid
deleted file mode 100644
index 7c7cfb2..0000000
--- a/performance/themes/complex-collection/templates/page.liquid
+++ /dev/null
@@ -1,4 +0,0 @@
-<main class="content-page">
-  {% render "snippets.page.header", page: page %}
-  {% render "snippets.page.content", page: page %}
-</main>
diff --git a/performance/themes/complex-collection/templates/product.liquid b/performance/themes/complex-collection/templates/product.liquid
deleted file mode 100644
index e91566b..0000000
--- a/performance/themes/complex-collection/templates/product.liquid
+++ /dev/null
@@ -1,3 +0,0 @@
-<main data-handle="{{ product.handle }}" class="product-page">
-  {% render "snippets.product.detail", product: product %}
-</main>
diff --git a/performance/themes/storefront/layout/theme.liquid b/performance/themes/storefront/layout/theme.liquid
new file mode 100644
index 0000000..3b47f5f
--- /dev/null
+++ b/performance/themes/storefront/layout/theme.liquid
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  {%- render "snippets.shared.meta_tags", shop: shop, page_title: page_title, template: template -%}
+</head>
+<body class="template-{{ template }}">
+  <a class="skip-link" href="#main-content">Skip to content</a>
+  {% render "snippets.shared.site_header", shop: shop, cart: cart, links: linklists.main_menu %}
+  <div id="main-content">
+    {{ content_for_layout }}
+  </div>
+  {% render "snippets.shared.site_footer", shop: shop, links: linklists.footer %}
+</body>
+</html>
diff --git a/performance/themes/storefront/snippets/collection/filters.liquid b/performance/themes/storefront/snippets/collection/filters.liquid
new file mode 100644
index 0000000..661cebf
--- /dev/null
+++ b/performance/themes/storefront/snippets/collection/filters.liquid
@@ -0,0 +1,16 @@
+{%- assign vendors = collection.products | map: 'vendor' | uniq | sort -%}
+<aside class="collection-filters" aria-label="Filters">
+  <h2>{% render "snippets.shared.icon", name: "filter" %} Refine</h2>
+  <h3>Tags</h3>
+  <ul class="collection-filters__tags">
+    {%- for tag in collection.tags %}
+    <li data-index="{{ forloop.index }}"><a href="{{ collection.url }}/{{ tag | downcase | replace: ' ', '-' }}">{{ tag }}</a></li>
+    {%- endfor %}
+  </ul>
+  <h3>Vendors</h3>
+  <ul class="collection-filters__vendors">
+    {%- for vendor in vendors %}
+    <li><a href="{{ collection.url }}?vendor={{ vendor | url_encode }}">{{ vendor }}</a></li>
+    {%- endfor %}
+  </ul>
+</aside>
diff --git a/performance/themes/storefront/snippets/collection/grid.liquid b/performance/themes/storefront/snippets/collection/grid.liquid
new file mode 100644
index 0000000..d0f167e
--- /dev/null
+++ b/performance/themes/storefront/snippets/collection/grid.liquid
@@ -0,0 +1,9 @@
+<section class="product-grid" data-count="{{ collection.products_count }}">
+  {%- for product in collection.products %}
+  <div class="product-grid__cell {% cycle 'cell--a', 'cell--b', 'cell--c' %}">
+    {%- render "snippets.product.card", product: product, position: forloop.index, label: collection.label -%}
+  </div>
+  {%- else %}
+  <p class="product-grid__empty">Nothing in this collection yet.</p>
+  {%- endfor %}
+</section>
diff --git a/performance/themes/storefront/snippets/collection/header.liquid b/performance/themes/storefront/snippets/collection/header.liquid
new file mode 100644
index 0000000..84dce94
--- /dev/null
+++ b/performance/themes/storefront/snippets/collection/header.liquid
@@ -0,0 +1,9 @@
+<header class="collection-header">
+  <p class="eyebrow">{{ collection.label | upcase }}</p>
+  <h1>{{ collection.title }}</h1>
+  <p class="collection-header__description">{{ collection.description }}</p>
+  <figure class="collection-header__image">
+    <img src="{{ collection.image.src }}" alt="{{ collection.image.alt | escape }}" width="{{ collection.image.width }}" height="{{ collection.image.height }}">
+  </figure>
+  {%- render "snippets.shared.button", label: "Shop all", url: collection.url, icon: "arrow", tone: "primary" -%}
+</header>
diff --git a/performance/themes/storefront/snippets/collection/toolbar.liquid b/performance/themes/storefront/snippets/collection/toolbar.liquid
new file mode 100644
index 0000000..1c1a516
--- /dev/null
+++ b/performance/themes/storefront/snippets/collection/toolbar.liquid
@@ -0,0 +1,16 @@
+{%- assign sort_options = 'featured,created-descending,price-ascending' | split: ',' -%}
+<div class="collection-toolbar">
+  <p class="collection-toolbar__count">{{ visible_count }} {{ visible_count | pluralize: 'product', 'products' }}, up to {{ products_per_page }} per page</p>
+  <ul class="collection-toolbar__sorts">
+    {%- for option in sort_options %}
+    {%- case option %}
+    {%- when 'featured' %}
+    <li><a href="{{ collection.url }}?sort_by={{ option }}">Featured</a></li>
+    {%- when 'created-descending' %}
+    <li><a href="{{ collection.url }}?sort_by={{ option }}">Newest first</a></li>
+    {%- else %}
+    <li><a href="{{ collection.url }}?sort_by={{ option }}">Price, low to high</a></li>
+    {%- endcase %}
+    {%- endfor %}
+  </ul>
+</div>
diff --git a/performance/themes/storefront/snippets/index/featured_products.liquid b/performance/themes/storefront/snippets/index/featured_products.liquid
new file mode 100644
index 0000000..860ef49
--- /dev/null
+++ b/performance/themes/storefront/snippets/index/featured_products.liquid
@@ -0,0 +1,11 @@
+<section class="featured">
+  <header class="featured__header">
+    <p class="eyebrow">Editor&rsquo;s picks</p>
+    <h2>Useful things for every day</h2>
+  </header>
+  <div class="featured__grid">
+    {%- for product in collection.products limit: 8 %}
+    {%- render "snippets.product.card", product: product, position: forloop.index, label: "featured" -%}
+    {%- endfor %}
+  </div>
+</section>
diff --git a/performance/themes/storefront/snippets/index/hero.liquid b/performance/themes/storefront/snippets/index/hero.liquid
new file mode 100644
index 0000000..6317ba5
--- /dev/null
+++ b/performance/themes/storefront/snippets/index/hero.liquid
@@ -0,0 +1,11 @@
+<section class="hero">
+  <div class="hero__text">
+    <p class="eyebrow">{{ collection.label | upcase }}</p>
+    <h1>{{ collection.title }}</h1>
+    <p>{{ shop.description }}</p>
+    {%- render "snippets.shared.button", label: "Explore the collection", url: collection.url, icon: "arrow", tone: "primary" -%}
+  </div>
+  <figure class="hero__media">
+    <img src="{{ collection.image.src }}" alt="{{ collection.image.alt | escape }}" width="{{ collection.image.width }}" height="{{ collection.image.height }}">
+  </figure>
+</section>
diff --git a/performance/themes/storefront/snippets/index/journal.liquid b/performance/themes/storefront/snippets/index/journal.liquid
new file mode 100644
index 0000000..6fbc31b
--- /dev/null
+++ b/performance/themes/storefront/snippets/index/journal.liquid
@@ -0,0 +1,22 @@
+<section class="journal">
+  <header class="journal__header">
+    <p class="eyebrow">From the journal</p>
+    <h2>Better everyday rituals</h2>
+  </header>
+  <div class="journal__entries">
+    {%- for article in articles %}
+    <article class="journal__entry">
+      <figure><img src="{{ article.image.src }}" alt="{{ article.image.alt | escape }}" width="{{ article.image.width }}" height="{{ article.image.height }}" loading="lazy"></figure>
+      <h3><a href="{{ article.url }}">{{ article.title }}</a></h3>
+      <p class="journal__meta">{{ article.author }} &middot; {{ article.published_at }} &middot; {{ article.reading_minutes }} min read</p>
+      <p>{{ article.excerpt }}</p>
+      <ul class="journal__tags">
+        {%- for tag in article.tags %}
+        <li>{{ tag | upcase }}</li>
+        {%- endfor %}
+      </ul>
+      {%- render "snippets.shared.button", label: "Read article", url: article.url, icon: "arrow", tone: "text" -%}
+    </article>
+    {%- endfor %}
+  </div>
+</section>
diff --git a/performance/themes/storefront/snippets/page/content.liquid b/performance/themes/storefront/snippets/page/content.liquid
new file mode 100644
index 0000000..935e18d
--- /dev/null
+++ b/performance/themes/storefront/snippets/page/content.liquid
@@ -0,0 +1,10 @@
+<div class="page-content">
+  <p class="page-content__lede">{{ page.content }}</p>
+  {%- for section in page.sections %}
+  <section class="page-content__section" id="section-{{ forloop.index }}">
+    <h2>{{ section.title }}</h2>
+    <p>{{ section.body }}</p>
+  </section>
+  {%- endfor %}
+  {%- render "snippets.shared.button", label: "Contact us", url: "/pages/contact", icon: "arrow", tone: "secondary" -%}
+</div>
diff --git a/performance/themes/storefront/snippets/page/header.liquid b/performance/themes/storefront/snippets/page/header.liquid
new file mode 100644
index 0000000..f6d0bd1
--- /dev/null
+++ b/performance/themes/storefront/snippets/page/header.liquid
@@ -0,0 +1,4 @@
+<header class="page-header">
+  <p class="eyebrow">{% render "snippets.shared.icon", name: "star" %} {{ shop.name }}</p>
+  <h1>{{ page.title }}</h1>
+</header>
diff --git a/performance/themes/storefront/snippets/product/badges.liquid b/performance/themes/storefront/snippets/product/badges.liquid
new file mode 100644
index 0000000..cd24d53
--- /dev/null
+++ b/performance/themes/storefront/snippets/product/badges.liquid
@@ -0,0 +1,6 @@
+<ul class="badges">
+  <li class="badges__label">{{ label }}</li>
+  {%- for badge in product.badges %}
+  <li class="badges__badge">{{ badge | upcase }}</li>
+  {%- endfor %}
+</ul>
diff --git a/performance/themes/storefront/snippets/product/card.liquid b/performance/themes/storefront/snippets/product/card.liquid
new file mode 100644
index 0000000..7b621ea
--- /dev/null
+++ b/performance/themes/storefront/snippets/product/card.liquid
@@ -0,0 +1,12 @@
+<article class="product-card" data-handle="{{ product.handle }}" data-position="{{ position }}">
+  <a class="product-card__media" href="{{ product.url }}">
+    <img src="{{ product.featured_image.src }}" alt="{{ product.featured_image.alt | escape }}" width="{{ product.featured_image.width }}" height="{{ product.featured_image.height }}" loading="lazy">
+  </a>
+  <div class="product-card__body">
+    <p class="product-card__vendor">{{ product.vendor | upcase }}</p>
+    <h3 class="product-card__title"><a href="{{ product.url }}">{{ product.title }}</a></h3>
+    {%- render "snippets.product.pricing", product: product -%}
+    {%- render "snippets.product.badges", product: product, label: label -%}
+    <p class="product-card__stock">{{ product.in_stock_variant_count }} {{ product.in_stock_variant_count | pluralize: 'option', 'options' }} in stock</p>
+  </div>
+</article>
diff --git a/performance/themes/storefront/snippets/product/detail.liquid b/performance/themes/storefront/snippets/product/detail.liquid
new file mode 100644
index 0000000..a2216fb
--- /dev/null
+++ b/performance/themes/storefront/snippets/product/detail.liquid
@@ -0,0 +1,13 @@
+<article class="product-detail">
+  {%- render "snippets.product.gallery", product: product -%}
+  <div class="product-detail__panel">
+    <p class="eyebrow">{{ product.vendor | upcase }}</p>
+    <h1>{{ product.title }}</h1>
+    <p class="product-detail__description">{{ product.description }}</p>
+    {%- render "snippets.product.pricing", product: product -%}
+    {%- render "snippets.product.variant_picker", product: product -%}
+    {%- render "snippets.shared.button", label: "Add to bag", url: "/cart/add", icon: "bag", tone: "primary" -%}
+    {%- render "snippets.product.badges", product: product, label: product.type -%}
+    {%- render "snippets.product.specs", product: product -%}
+  </div>
+</article>
diff --git a/performance/themes/storefront/snippets/product/gallery.liquid b/performance/themes/storefront/snippets/product/gallery.liquid
new file mode 100644
index 0000000..095f6bf
--- /dev/null
+++ b/performance/themes/storefront/snippets/product/gallery.liquid
@@ -0,0 +1,8 @@
+<div class="gallery">
+  {%- for image in product.images %}
+  <figure class="gallery__item" data-index="{{ forloop.index }}">
+    <img src="{{ image.src }}" alt="{{ image.alt | escape }}" width="{{ image.width }}" height="{{ image.height }}" style="aspect-ratio: {{ image.aspect_ratio }}"{% unless forloop.first %} loading="lazy"{% endunless %}>
+    <figcaption>{{ image.alt }}</figcaption>
+  </figure>
+  {%- endfor %}
+</div>
diff --git a/performance/themes/storefront/snippets/product/pricing.liquid b/performance/themes/storefront/snippets/product/pricing.liquid
new file mode 100644
index 0000000..552f47b
--- /dev/null
+++ b/performance/themes/storefront/snippets/product/pricing.liquid
@@ -0,0 +1,7 @@
+<p class="pricing">
+  {%- render "snippets.shared.price", cents: product.price_cents -%}
+  {%- if product.on_sale %}
+  <s class="pricing__was">{% render "snippets.shared.price", cents: product.compare_at_price_cents %}</s>
+  <span class="pricing__saving">Save {{ product.saving_cents | money }}</span>
+  {%- endif %}
+</p>
diff --git a/performance/themes/storefront/snippets/product/specs.liquid b/performance/themes/storefront/snippets/product/specs.liquid
new file mode 100644
index 0000000..8941559
--- /dev/null
+++ b/performance/themes/storefront/snippets/product/specs.liquid
@@ -0,0 +1,10 @@
+<table class="specs">
+  <caption>Details</caption>
+  <tbody>
+    <tr><th scope="row">Vendor</th><td>{{ product.vendor }}</td></tr>
+    <tr><th scope="row">Type</th><td>{{ product.type }}</td></tr>
+    <tr><th scope="row">Material</th><td>{{ product.metafields.material }}</td></tr>
+    <tr><th scope="row">Care</th><td>{{ product.metafields.care }}</td></tr>
+    <tr><th scope="row">Availability</th><td>{{ product.in_stock_variant_count }} of {{ product.variants | size }} in stock</td></tr>
+  </tbody>
+</table>
diff --git a/performance/themes/storefront/snippets/product/variant_picker.liquid b/performance/themes/storefront/snippets/product/variant_picker.liquid
new file mode 100644
index 0000000..01fb532
--- /dev/null
+++ b/performance/themes/storefront/snippets/product/variant_picker.liquid
@@ -0,0 +1,21 @@
+{%- liquid
+  assign default_variant = null
+  for variant in product.variants
+    if variant.available
+      assign default_variant = variant
+      break
+    endif
+  endfor
+-%}
+<fieldset class="variant-picker">
+  <legend>Choose an option</legend>
+  {%- for variant in product.variants %}
+    {%- unless variant.available %}{% continue %}{% endunless %}
+  <label class="variant-picker__option">
+    <input type="radio" name="id" value="{{ variant.id }}"{% if variant.id == default_variant.id %} checked{% endif %}>
+    <span class="variant-picker__name">{{ variant.option }}</span>
+    <span class="variant-picker__price">{{ variant.price_cents | money }}</span>
+  </label>
+  {%- endfor %}
+  <p class="variant-picker__note">{{ product.in_stock_variant_count }} of {{ product.variants | size }} {{ product.variants | size | pluralize: 'option', 'options' }} available, shipping from {{ default_variant.option }}</p>
+</fieldset>
diff --git a/performance/themes/storefront/snippets/shared/breadcrumbs.liquid b/performance/themes/storefront/snippets/shared/breadcrumbs.liquid
new file mode 100644
index 0000000..7486735
--- /dev/null
+++ b/performance/themes/storefront/snippets/shared/breadcrumbs.liquid
@@ -0,0 +1,9 @@
+<nav class="breadcrumbs" aria-label="Breadcrumb">
+  <ol>
+    <li><a href="/">Home</a></li>
+    {%- unless parent_title == '' %}
+    <li><a href="{{ parent_url }}">{{ parent_title }}</a></li>
+    {%- endunless %}
+    <li aria-current="page">{{ title }}</li>
+  </ol>
+</nav>
diff --git a/performance/themes/storefront/snippets/shared/button.liquid b/performance/themes/storefront/snippets/shared/button.liquid
new file mode 100644
index 0000000..6edef67
--- /dev/null
+++ b/performance/themes/storefront/snippets/shared/button.liquid
@@ -0,0 +1,2 @@
+{%- capture button_class %}button button--{{ tone }}{% endcapture -%}
+<a class="{{ button_class }}" href="{{ url }}">{% render "snippets.shared.icon", name: icon %}<span>{{ label }}</span></a>
diff --git a/performance/themes/storefront/snippets/shared/icon.liquid b/performance/themes/storefront/snippets/shared/icon.liquid
new file mode 100644
index 0000000..657be11
--- /dev/null
+++ b/performance/themes/storefront/snippets/shared/icon.liquid
@@ -0,0 +1,7 @@
+{%- case name -%}
+{%- when 'arrow' -%}<svg class="icon icon--arrow" viewBox="0 0 12 12" aria-hidden="true"><path d="M1 6h9M7 2l4 4-4 4"/></svg>
+{%- when 'bag' -%}<svg class="icon icon--bag" viewBox="0 0 12 12" aria-hidden="true"><path d="M2 4h8l-1 7H3L2 4zm2 0a2 2 0 014 0"/></svg>
+{%- when 'filter' -%}<svg class="icon icon--filter" viewBox="0 0 12 12" aria-hidden="true"><path d="M1 2h10L7 7v3l-2 1V7L1 2z"/></svg>
+{%- when 'star' -%}<svg class="icon icon--star" viewBox="0 0 12 12" aria-hidden="true"><path d="M6 1l1.6 3.3 3.4.5-2.5 2.4.6 3.4L6 9l-3.1 1.6.6-3.4L1 4.8l3.4-.5z"/></svg>
+{%- else -%}<svg class="icon icon--dot" viewBox="0 0 12 12" aria-hidden="true"><circle cx="6" cy="6" r="3"/></svg>
+{%- endcase -%}
diff --git a/performance/themes/storefront/snippets/shared/meta_tags.liquid b/performance/themes/storefront/snippets/shared/meta_tags.liquid
new file mode 100644
index 0000000..89a2636
--- /dev/null
+++ b/performance/themes/storefront/snippets/shared/meta_tags.liquid
@@ -0,0 +1,23 @@
+{%- capture meta_title %}{{ page_title | escape }} &mdash; {{ shop.name | escape }}{% endcapture -%}
+{%- liquid
+  case template
+    when 'index'
+      assign meta_description = shop.description
+    when 'collection'
+      assign meta_description = 'Shop the summer collection at ' | append: shop.name
+    when 'product'
+      assign meta_description = 'Product details and sizing at ' | append: shop.name
+    else
+      assign meta_description = shop.description
+  endcase
+  assign canonical = 'https://' | append: shop.domain
+-%}
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>{{ meta_title }}</title>
+<meta name="description" content="{{ meta_description | escape }}">
+<meta property="og:site_name" content="{{ shop.name | escape }}">
+<meta property="og:title" content="{{ meta_title }}">
+<meta property="og:type" content="website">
+<meta property="og:url" content="{{ canonical }}">
+<link rel="canonical" href="{{ canonical }}">
diff --git a/performance/themes/storefront/snippets/shared/newsletter.liquid b/performance/themes/storefront/snippets/shared/newsletter.liquid
new file mode 100644
index 0000000..39b5469
--- /dev/null
+++ b/performance/themes/storefront/snippets/shared/newsletter.liquid
@@ -0,0 +1,9 @@
+<section class="newsletter">
+  <h2>Field notes</h2>
+  <p>Occasional letters from {{ shop.name }}, no more than one a month.</p>
+  <form class="newsletter__form" action="/contact#newsletter" method="post">
+    <label for="newsletter-email">Email address</label>
+    <input id="newsletter-email" type="email" name="contact[email]" autocomplete="email" required>
+    <button type="submit">Subscribe</button>
+  </form>
+</section>
diff --git a/performance/themes/storefront/snippets/shared/price.liquid b/performance/themes/storefront/snippets/shared/price.liquid
new file mode 100644
index 0000000..b85b61a
--- /dev/null
+++ b/performance/themes/storefront/snippets/shared/price.liquid
@@ -0,0 +1 @@
+<span class="price">{{ cents | money }}</span>
diff --git a/performance/themes/storefront/snippets/shared/site_footer.liquid b/performance/themes/storefront/snippets/shared/site_footer.liquid
new file mode 100644
index 0000000..bb6a612
--- /dev/null
+++ b/performance/themes/storefront/snippets/shared/site_footer.liquid
@@ -0,0 +1,20 @@
+<footer class="site-footer">
+  <div class="site-footer__columns">
+    <section class="site-footer__column">
+      <h2>{{ shop.name }}</h2>
+      <p>{{ shop.description }}</p>
+    </section>
+    <section class="site-footer__column">
+      <h2>Help</h2>
+      <ul>
+        {%- for link in links %}
+        <li><a href="{{ link.url }}">{{ link.title }}</a></li>
+        {%- endfor %}
+      </ul>
+    </section>
+    <section class="site-footer__column">
+      {%- render "snippets.shared.newsletter", shop: shop -%}
+    </section>
+  </div>
+  <p class="site-footer__legal">All prices in {{ shop.currency }}. &copy; {{ shop.name }}.</p>
+</footer>
diff --git a/performance/themes/storefront/snippets/shared/site_header.liquid b/performance/themes/storefront/snippets/shared/site_header.liquid
new file mode 100644
index 0000000..efee37f
--- /dev/null
+++ b/performance/themes/storefront/snippets/shared/site_header.liquid
@@ -0,0 +1,18 @@
+<header class="site-header">
+  <a class="site-header__brand" href="/">{{ shop.name }}</a>
+  <nav class="site-header__nav" aria-label="Main navigation">
+    <ul>
+      {%- for link in links %}
+      <li><a href="{{ link.url }}">{{ link.title }}</a></li>
+      {%- endfor %}
+    </ul>
+  </nav>
+  <p class="site-header__cart">
+    {%- render "snippets.shared.icon", name: "bag" -%}
+    {%- if cart.is_empty %}
+    <span>Your bag is empty</span>
+    {%- else %}
+    <span>{{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} &middot; {{ cart.total_price | money }}</span>
+    {%- endif %}
+  </p>
+</header>
diff --git a/performance/themes/storefront/templates/collection.liquid b/performance/themes/storefront/templates/collection.liquid
new file mode 100644
index 0000000..c165a37
--- /dev/null
+++ b/performance/themes/storefront/templates/collection.liquid
@@ -0,0 +1,13 @@
+{%- liquid
+  assign visible_count = collection.products_count
+  assign heading = collection.title
+-%}
+<main class="collection" data-collection="{{ collection.handle }}">
+  {%- render "snippets.shared.breadcrumbs", title: heading, parent_title: "Collections", parent_url: "/collections" -%}
+  {%- render "snippets.collection.header", collection: collection -%}
+  {%- render "snippets.collection.toolbar", collection: collection, visible_count: visible_count, products_per_page: products_per_page -%}
+  <div class="collection__body">
+    {%- render "snippets.collection.filters", collection: collection -%}
+    {%- render "snippets.collection.grid", collection: collection -%}
+  </div>
+</main>
diff --git a/performance/themes/storefront/templates/index.liquid b/performance/themes/storefront/templates/index.liquid
new file mode 100644
index 0000000..cb07479
--- /dev/null
+++ b/performance/themes/storefront/templates/index.liquid
@@ -0,0 +1,5 @@
+<main class="home">
+  {%- render "snippets.index.hero", collection: collection, shop: shop -%}
+  {%- render "snippets.index.featured_products", collection: collection -%}
+  {%- render "snippets.index.journal", articles: articles -%}
+</main>
diff --git a/performance/themes/storefront/templates/page.liquid b/performance/themes/storefront/templates/page.liquid
new file mode 100644
index 0000000..fcb2444
--- /dev/null
+++ b/performance/themes/storefront/templates/page.liquid
@@ -0,0 +1,5 @@
+<main class="page">
+  {%- render "snippets.shared.breadcrumbs", title: page.title, parent_title: "About", parent_url: "/pages" -%}
+  {%- render "snippets.page.header", page: page, shop: shop -%}
+  {%- render "snippets.page.content", page: page -%}
+</main>
diff --git a/performance/themes/storefront/templates/product.liquid b/performance/themes/storefront/templates/product.liquid
new file mode 100644
index 0000000..6588f51
--- /dev/null
+++ b/performance/themes/storefront/templates/product.liquid
@@ -0,0 +1,13 @@
+<main class="product" data-handle="{{ product.handle }}">
+  {%- render "snippets.shared.breadcrumbs", title: product.title, parent_title: product.type, parent_url: "/collections/all" -%}
+  {%- render "snippets.product.detail", product: product -%}
+  <section class="product__related">
+    <h2>You might also like</h2>
+    <div class="product__related-grid">
+      {%- for related in collection.products limit: 5 %}
+      {%- if related.handle == product.handle %}{% continue %}{% endif %}
+      {%- render "snippets.product.card", product: related, position: forloop.index, label: "related" -%}
+      {%- endfor %}
+    </div>
+  </section>
+</main>
diff --git a/tests/Integration/Performance/ComplexThemeFixtureTest.php b/tests/Integration/Performance/ComplexThemeFixtureTest.php
deleted file mode 100644
index df72e5d..0000000
--- a/tests/Integration/Performance/ComplexThemeFixtureTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-use Keepsuit\Liquid\Performance\benchmarks\Support\ComplexThemeFixture;
-
-test('complex theme fixture renders every page through the shared layout', function () {
-    $environment = ComplexThemeFixture::environment();
-
-    expect(ComplexThemeFixture::templateNames())
-        ->toContain('layout.theme')
-        ->toContain('templates.index')
-        ->toContain('templates.collection')
-        ->toContain('templates.product')
-        ->toContain('templates.page')
-        ->toContain('snippets.shared.button')
-        ->toContain('snippets.product.card');
-
-    foreach ([
-        'templates.index' => 'Better everyday rituals',
-        'templates.collection' => '24 products selected',
-        'templates.product' => 'Weekend Bag',
-        'templates.page' => 'Northstar journal',
-    ] as $templateName => $expectedContent) {
-        $rendered = ComplexThemeFixture::renderPage($environment, $templateName);
-        $streamed = implode('', iterator_to_array(
-            ComplexThemeFixture::streamPage($environment, $templateName),
-            false,
-        ));
-
-        expect($rendered)
-            ->toContain('<header class="site-header">')
-            // Unknown filters render as their unmodified input, so assert on
-            // filtered output to keep a missing filter from passing silently.
-            ->toContain('Cart: 3 items / €126.50')
-            ->toContain($expectedContent)
-            ->toContain('<footer class="site-footer">')
-            ->and($streamed)->toBe($rendered);
-    }
-});
diff --git a/tests/Integration/Performance/StorefrontThemeTest.php b/tests/Integration/Performance/StorefrontThemeTest.php
new file mode 100644
index 0000000..fa4b5f5
--- /dev/null
+++ b/tests/Integration/Performance/StorefrontThemeTest.php
@@ -0,0 +1,132 @@
+<?php
+
+use Keepsuit\Liquid\Performance\Support\Database;
+use Keepsuit\Liquid\Performance\Support\StorefrontTheme;
+
+/**
+ * The benchmark environment runs with the library defaults, because that is what
+ * a real application looks like. The fixture is verified with every strict option
+ * on instead: strictVariables and strictFilters turn a missing drop method,
+ * variable or filter into a failure here, rather than into empty output nobody
+ * notices in a benchmark.
+ */
+function storefrontStrictEnvironment(): Keepsuit\Liquid\Environment
+{
+    return StorefrontTheme::environmentFactory()
+        ->setStrictVariables(true)
+        ->setStrictFilters(true)
+        ->setRethrowErrors(true)
+        ->build();
+}
+
+test('every declared template exists and every template on disk is declared', function () {
+    $declared = StorefrontTheme::templateNames();
+
+    expect($declared)->toHaveCount(29);
+
+    foreach ($declared as $templateName) {
+        expect(StorefrontTheme::templatePath($templateName))->toBeReadableFile();
+    }
+
+    $onDisk = [];
+    $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(StorefrontTheme::themePath()));
+    foreach ($files as $file) {
+        if (! $file instanceof SplFileInfo) {
+            continue;
+        }
+
+        if ($file->isFile() && $file->getExtension() === 'liquid') {
+            $relative = substr($file->getPathname(), strlen(StorefrontTheme::themePath()) + 1, -7);
+            $onDisk[] = str_replace(DIRECTORY_SEPARATOR, '.', $relative);
+        }
+    }
+
+    sort($onDisk);
+    $expected = $declared;
+    sort($expected);
+
+    // An undeclared template is invisible to the parse benchmarks, so it would be
+    // silently excluded from every measurement.
+    expect($onDisk)->toBe($expected);
+});
+
+test('every page renders through the layout with no missing variables or filters', function () {
+    $environment = storefrontStrictEnvironment();
+
+    foreach ([
+        'templates.index' => 'Better everyday rituals',
+        'templates.collection' => 'Summer Essentials',
+        'templates.product' => 'Weekend Bag',
+        'templates.page' => 'Our story',
+    ] as $templateName => $expectedContent) {
+        $rendered = StorefrontTheme::renderPage($environment, $templateName);
+
+        expect($rendered)
+            ->toContain('<header class="site-header">')
+            ->toContain($expectedContent)
+            ->toContain('<footer class="site-footer">')
+            // Fixture filters, asserted on their output: an unknown filter renders
+            // its input unchanged, so only a filtered value proves it ran.
+            ->toContain('3 items &middot; €126.50')
+            // A capture that escapes its assembled result would double-escape this.
+            ->toMatch('/<title>[^<]+ &mdash; Northstar Goods<\/title>/');
+    }
+});
+
+test('streaming a page produces the same bytes as rendering it', function () {
+    $environment = storefrontStrictEnvironment();
+
+    foreach (StorefrontTheme::pageTemplateNames() as $templateName) {
+        $rendered = StorefrontTheme::renderPage($environment, $templateName);
+        $streamed = implode('', iterator_to_array(
+            StorefrontTheme::streamPage($environment, $templateName),
+            false,
+        ));
+
+        expect($streamed)->toBe($rendered);
+    }
+});
+
+test('the collection page renders every product in the collection', function () {
+    $environment = storefrontStrictEnvironment();
+
+    $rendered = StorefrontTheme::renderPage($environment, 'templates.collection');
+
+    expect(Database::collection()->products)->toHaveCount(Database::PRODUCTS_PER_PAGE)
+        ->and(substr_count($rendered, 'class="product-card"'))->toBe(Database::PRODUCTS_PER_PAGE);
+});
+
+test('hand-wired cart totals stay consistent with the rendered summary', function () {
+    // Database assigns rather than computes, so the cart total is a literal that
+    // can drift from item_count. Pin both rather than trusting the data.
+    $cart = Database::cart();
+
+    expect($cart->itemCount)->toBe(3)
+        ->and($cart->totalPrice)->toBe(12650)
+        ->and($cart->isEmpty())->toBeFalse();
+});
+
+test('products expose each drop resolution strategy the theme relies on', function () {
+    $product = Database::product();
+
+    // Public typed property.
+    expect($product->title)->toBe('Weekend Bag');
+
+    // Derived methods.
+    expect($product->onSale())->toBeTrue();
+    expect($product->savingCents())->toBe(2000);
+
+    // #[Cache]d method, and its value must survive a second read.
+    expect($product->inStockVariantCount())->toBe(3);
+    expect($product->inStockVariantCount())->toBe(3);
+});
+
+test('metafields resolve through liquidMethodMissing when the theme renders them', function () {
+    // The one dynamic path in the fixture, asserted through a real render so the
+    // template lookup is what proves it, not a direct property access.
+    $rendered = StorefrontTheme::renderPage(storefrontStrictEnvironment(), 'templates.product');
+
+    expect($rendered)
+        ->toContain('<td>Waxed canvas, bridle leather</td>')
+        ->toContain('<td>Condition leather twice a year</td>');
+});

From 73695c036b525777bd8ea98da18a54756be989f7 Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 13:00:11 +0200
Subject: [PATCH 09/11] Address review findings on the storefront fixture
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Convention, from the two liquidMethodMissing implementations in src/Drops:
MetafieldsDrop declares #[DropDynamicProperties], so toArray() can see the
dynamic keys. It does not affect Drop::__get resolution.

The eleven-key product row shape was written out twice; it is now one
@phpstan-type, as src/Parse and src/Nodes already do for their shapes.

page_title restated titles that Database entities already owned, in a match
inside StorefrontTheme — which also made that class change for two reasons.
Titles shared by an entity and by the page title now live in one constant each,
and the product title is read from the row rather than from a built drop:
resolving the duplication through Database::product() would have rebuilt all 24
products per render, undoing the construction fix.

Removed ROOT_TEMPLATE_NAME and the default arguments that referenced it — no
caller omitted the argument — and the breadcrumb branch for an empty parent,
which all three call sites passed a literal for.

Corrected three documentation claims that overstated the fixture: the nav is
flat by design rather than nested, #[Cache] is read twice per instance on the
product page rather than by three snippets, and the ~6% fixture-construction
share is a measured reference point with no assertion behind it, so it says how
to re-measure. The deferred list gains the liquidMethodMissing hit path, which
OperationBench stopped covering when its drop was swapped.

Fixture construction re-measured at 6.3% of benchRender.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 performance/README.md                         | 20 +++--
 performance/Support/Database.php              | 74 +++++++++++--------
 performance/Support/Drops/MetafieldsDrop.php  |  6 ++
 performance/Support/Drops/ProductDrop.php     |  9 ++-
 performance/Support/StorefrontTheme.php       | 17 ++---
 performance/benchmarks/OperationBench.php     |  7 ++
 .../snippets/shared/breadcrumbs.liquid        |  2 -
 7 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/performance/README.md b/performance/README.md
index 08228a1..3a392ab 100644
--- a/performance/README.md
+++ b/performance/README.md
@@ -28,8 +28,10 @@ theme's job.
 ## The storefront fixture
 
 `performance/themes/storefront/` is a deliberately plausible storefront: real
-`<head>` metadata, nested navigation, breadcrumbs, a product grid, a filter
-sidebar, a variant picker, a multi-column footer. It uses only tags a real theme
+`<head>` metadata, a main nav, breadcrumbs, a product grid, a filter sidebar, a
+variant picker, a specs table, a multi-column footer. The nav is deliberately
+flat — multi-level menus were ruled out as breadth the fixture does not need, and
+depth comes from the product graph instead. It uses only tags a real theme
 would use (`render`, `for`/`else`, `if`, `unless`, `case`, `capture`, `cycle`,
 `assign`, `break`, `continue`, `{% liquid %}`).
 
@@ -41,9 +43,10 @@ Constraints that are not obvious from reading the code:
   160 times per iteration and moves the macro numbers for reasons that have
   nothing to do with the library. Derived values go into the literal data or
   onto a drop method, where they are measured as template work. Building the
-  fixture is roughly **6% of `ThemeBench::benchRender`**; if that share climbs,
-  the macro numbers are drifting for fixture reasons and something here computes
-  when it should assign.
+  fixture measured **~6% of `ThemeBench::benchRender`** when this landed — nothing
+  asserts that, so treat it as a reference point rather than a guarantee. To
+  re-measure, time `StorefrontTheme::renderData()` twice per page (the layout gets
+  its own context) against `renderPage()` over the same pages.
 - **Fixed dataset: 24 products.** A deliberate page size, not an accident.
 - **Fresh drops per render.** `#[Cache]` therefore starts cold on every render,
   and no state is shared between revolutions. Memoized instances would measure a
@@ -66,7 +69,7 @@ somewhere a real storefront drop would genuinely use it:
 | --- | --- | --- |
 | Public typed property | Cheapest — first lookup loop | Stored fields: `title`, `handle`, `price_cents` |
 | Invokable method | Misses the property loop first | Derived values: `on_sale`, `saving_cents`, `url` |
-| `#[Cache]`d method | Method cost, once per instance | `in_stock_variant_count` — walks every variant, read by three snippets |
+| `#[Cache]`d method | Method cost, once per instance | `in_stock_variant_count` — walks every variant; read twice per instance on the product page, once on a card |
 | `liquidMethodMissing` | Most expensive; a **miss** throws and catches up to three exceptions | `MetafieldsDrop` only, where keys are genuinely arbitrary |
 
 ## Verifying the fixture
@@ -91,6 +94,11 @@ Known gaps, in rough priority order:
 - **The drop miss path.** The most expensive branch of `Drop::__get` (a
   `liquidMethodMissing` miss, up to three thrown exceptions) is unmeasured. It
   belongs in `micro`, not the theme, because the theme must stay strict.
+- **The `liquidMethodMissing` *hit* path in `micro`.** `OperationBench`'s drop
+  subjects used to run on `DatabaseDrop`, whose every lookup was a method-missing
+  hit. They now use `ProductDrop`, so both subjects resolve a public property —
+  the cheapest branch. The theme still exercises the hit path through
+  `MetafieldsDrop`, but no micro subject isolates it.
 - **Size-parameterized scaling.** With one fixed dataset, nothing distinguishes
   "everything is 10% slower" from "something became superlinear". A
   `ParamProviders` spread (4 / 24 / 96 products) would show the shape.
diff --git a/performance/Support/Database.php b/performance/Support/Database.php
index 8162042..e437d26 100644
--- a/performance/Support/Database.php
+++ b/performance/Support/Database.php
@@ -16,6 +16,20 @@
 /**
  * Fixture data for the storefront benchmark theme.
  *
+ * @phpstan-type ProductRow array{
+ *     handle: string,
+ *     title: string,
+ *     vendor: string,
+ *     type: string,
+ *     description: string,
+ *     price: int,
+ *     compare_at: int,
+ *     badges: list<string>,
+ *     variants: non-empty-list<array{string, string, string, int, bool}>,
+ *     images: non-empty-list<array{string, string, int, int}>,
+ *     metafields: array<string, string>
+ * }
+ *
  * Two rules govern this class, and both exist to keep the benchmark measuring
  * the library rather than the fixture. See performance/README.md.
  *
@@ -29,24 +43,22 @@ final class Database
 {
     public const PRODUCTS_PER_PAGE = 24;
 
+    /**
+     * Titles shared by an entity and by pageTitle(), held once so the two cannot
+     * drift apart.
+     */
+    private const COLLECTION_TITLE = 'Summer Essentials';
+
+    private const PAGE_TITLE = 'Our story';
+
+    private const FEATURED_PRODUCT_INDEX = 4;
+
     /**
      * The rows live behind a method rather than a constant on purpose: PHPStan
      * treats a literal array this large as an `oversized-array` and collapses the
      * per-key types into one union, whereas it trusts a declared return type.
      *
-     * @return non-empty-list<array{
-     *     handle: string,
-     *     title: string,
-     *     vendor: string,
-     *     type: string,
-     *     description: string,
-     *     price: int,
-     *     compare_at: int,
-     *     badges: list<string>,
-     *     variants: non-empty-list<array{string, string, string, int, bool}>,
-     *     images: non-empty-list<array{string, string, int, int}>,
-     *     metafields: array<string, string>
-     * }>
+     * @return non-empty-list<ProductRow>
      */
     private static function productRows(): array
     {
@@ -295,6 +307,22 @@ private static function productRows(): array
         ],
     ];
 
+    /**
+     * The <title> for each page type. Fixture data, so it lives here rather than
+     * in StorefrontTheme, which owns environment wiring only.
+     */
+    public static function pageTitle(string $template): string
+    {
+        return match ($template) {
+            'index' => 'New arrivals',
+            // Read from the row rather than the drop: product() would build the
+            // whole product graph just to reach a string.
+            'product' => self::productRows()[self::FEATURED_PRODUCT_INDEX]['title'],
+            'page' => self::PAGE_TITLE,
+            default => self::COLLECTION_TITLE,
+        };
+    }
+
     public static function shop(): ShopDrop
     {
         return new ShopDrop(
@@ -338,19 +366,7 @@ public static function products(): array
     }
 
     /**
-     * @param  array{
-     *     handle: string,
-     *     title: string,
-     *     vendor: string,
-     *     type: string,
-     *     description: string,
-     *     price: int,
-     *     compare_at: int,
-     *     badges: list<string>,
-     *     variants: non-empty-list<array{string, string, string, int, bool}>,
-     *     images: non-empty-list<array{string, string, int, int}>,
-     *     metafields: array<string, string>
-     * }  $row
+     * @param  ProductRow  $row
      */
     private static function productFromRow(array $row): ProductDrop
     {
@@ -387,7 +403,7 @@ public static function collection(): CollectionDrop
     {
         return new CollectionDrop(
             handle: 'summer-essentials',
-            title: 'Summer Essentials',
+            title: self::COLLECTION_TITLE,
             label: 'summer',
             description: 'Everyday pieces for long weekends, slow mornings and bright afternoons.',
             tags: ['New arrivals', 'Travel ready', 'Summer layers', 'Gifts under 100', 'Last few'],
@@ -403,14 +419,14 @@ public static function collection(): CollectionDrop
      */
     public static function product(): ProductDrop
     {
-        return self::productFromRow(self::productRows()[4]);
+        return self::productFromRow(self::productRows()[self::FEATURED_PRODUCT_INDEX]);
     }
 
     public static function page(): PageDrop
     {
         return new PageDrop(
             handle: 'our-story',
-            title: 'Our story',
+            title: self::PAGE_TITLE,
             content: 'Northstar Goods began with a single canvas bag and a stubborn belief that most things are made too quickly.',
             sections: [
                 ['title' => 'How we choose makers', 'body' => 'We visit every workshop before we place an order, and we place small orders first.'],
diff --git a/performance/Support/Drops/MetafieldsDrop.php b/performance/Support/Drops/MetafieldsDrop.php
index 603792b..711f011 100644
--- a/performance/Support/Drops/MetafieldsDrop.php
+++ b/performance/Support/Drops/MetafieldsDrop.php
@@ -2,6 +2,7 @@
 
 namespace Keepsuit\Liquid\Performance\Support\Drops;
 
+use Keepsuit\Liquid\Attributes\DropDynamicProperties;
 use Keepsuit\Liquid\Drop;
 use Keepsuit\Liquid\Exceptions\UndefinedDropMethodException;
 
@@ -23,6 +24,11 @@ public function __construct(
         private readonly array $fields,
     ) {}
 
+    /**
+     * Declared so toArray() can see the dynamic keys, as both liquidMethodMissing
+     * implementations in src/Drops do. It does not affect Drop::__get resolution.
+     */
+    #[DropDynamicProperties(['care', 'material'])]
     protected function liquidMethodMissing(string $name): mixed
     {
         if (array_key_exists($name, $this->fields)) {
diff --git a/performance/Support/Drops/ProductDrop.php b/performance/Support/Drops/ProductDrop.php
index f94d698..2c1813d 100644
--- a/performance/Support/Drops/ProductDrop.php
+++ b/performance/Support/Drops/ProductDrop.php
@@ -47,9 +47,12 @@ public function savingCents(): int
     }
 
     /**
-     * Walks every variant, and is read by the card, the detail panel and the
-     * specs table on the same render — the one place in this fixture where
-     * #[Cache] earns its keep rather than caching a ternary.
+     * Walks every variant instead of returning a stored field, which is why it is
+     * a method rather than a property.
+     *
+     * The cache earns its keep on the product page, where variant_picker and specs
+     * both read it for the same instance. On a card it is read once, so the cache
+     * is populated and never hit — that asymmetry is realistic and deliberate.
      */
     #[Cache]
     public function inStockVariantCount(): int
diff --git a/performance/Support/StorefrontTheme.php b/performance/Support/StorefrontTheme.php
index 09a6f44..e422ba8 100644
--- a/performance/Support/StorefrontTheme.php
+++ b/performance/Support/StorefrontTheme.php
@@ -19,14 +19,12 @@ final class StorefrontTheme
 {
     public const LAYOUT_TEMPLATE_NAME = 'layout.theme';
 
-    public const ROOT_TEMPLATE_NAME = 'templates.collection';
-
     /**
      * @var list<string>
      */
     private const PAGE_TEMPLATE_NAMES = [
         'templates.index',
-        self::ROOT_TEMPLATE_NAME,
+        'templates.collection',
         'templates.product',
         'templates.page',
     ];
@@ -120,7 +118,7 @@ public static function templateSource(string $templateName): string
     /**
      * @return array<string, mixed>
      */
-    public static function renderData(string $pageTemplateName = self::ROOT_TEMPLATE_NAME): array
+    public static function renderData(string $pageTemplateName): array
     {
         $template = str_replace('templates.', '', $pageTemplateName);
 
@@ -132,12 +130,7 @@ public static function renderData(string $pageTemplateName = self::ROOT_TEMPLATE
                 'footer' => Database::footerMenu(),
             ],
             'template' => $template,
-            'page_title' => match ($template) {
-                'index' => 'New arrivals',
-                'product' => 'Weekend Bag',
-                'page' => 'Our story',
-                default => 'Summer Essentials',
-            },
+            'page_title' => Database::pageTitle($template),
             'collection' => Database::collection(),
             'product' => Database::product(),
             'page' => Database::page(),
@@ -148,7 +141,7 @@ public static function renderData(string $pageTemplateName = self::ROOT_TEMPLATE
 
     public static function newRenderContext(
         Environment $environment,
-        string $pageTemplateName = self::ROOT_TEMPLATE_NAME,
+        string $pageTemplateName,
     ): RenderContext {
         return $environment->newRenderContext(staticData: self::renderData($pageTemplateName));
     }
@@ -156,7 +149,7 @@ public static function newRenderContext(
     public static function newLayoutRenderContext(
         Environment $environment,
         mixed $content,
-        string $pageTemplateName = self::ROOT_TEMPLATE_NAME,
+        string $pageTemplateName,
     ): RenderContext {
         return $environment->newRenderContext(staticData: [
             ...self::renderData($pageTemplateName),
diff --git a/performance/benchmarks/OperationBench.php b/performance/benchmarks/OperationBench.php
index a02e893..30e37be 100644
--- a/performance/benchmarks/OperationBench.php
+++ b/performance/benchmarks/OperationBench.php
@@ -32,6 +32,13 @@ class OperationBench
 
     private Template $filterWithArgumentsTemplate;
 
+    /**
+     * Built in setUp, not in the subject: these two subjects measure how
+     * Drop::__get resolves a property, and constructing a ProductDrop (variants,
+     * images, metafields) inside the subject would swamp that with fixture cost.
+     * Sharing one instance across revolutions is safe here only because the
+     * template reads a public property and never a #[Cache]d method.
+     */
     private ProductDrop $productDrop;
 
     public function setUp(): void
diff --git a/performance/themes/storefront/snippets/shared/breadcrumbs.liquid b/performance/themes/storefront/snippets/shared/breadcrumbs.liquid
index 7486735..a991911 100644
--- a/performance/themes/storefront/snippets/shared/breadcrumbs.liquid
+++ b/performance/themes/storefront/snippets/shared/breadcrumbs.liquid
@@ -1,9 +1,7 @@
 <nav class="breadcrumbs" aria-label="Breadcrumb">
   <ol>
     <li><a href="/">Home</a></li>
-    {%- unless parent_title == '' %}
     <li><a href="{{ parent_url }}">{{ parent_title }}</a></li>
-    {%- endunless %}
     <li aria-current="page">{{ title }}</li>
   </ol>
 </nav>

From c573c544afe26cd334a526bd98891fa3e5608467 Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 14:08:15 +0200
Subject: [PATCH 10/11] Split benchmark groups by workload

---
 .github/workflows/phpbench.yml                |  3 +-
 composer.json                                 |  5 ++-
 performance/README.md                         | 39 ++++++++++---------
 performance/benchmarks/OperationBench.php     |  2 +-
 performance/benchmarks/TemplateCacheBench.php |  2 +-
 performance/benchmarks/ThemeBench.php         |  6 +--
 6 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/phpbench.yml b/.github/workflows/phpbench.yml
index 27d4657..08a0e11 100644
--- a/.github/workflows/phpbench.yml
+++ b/.github/workflows/phpbench.yml
@@ -78,7 +78,7 @@ jobs:
           set -euo pipefail
 
           vendor/bin/phpbench run \
-            --group=macro \
+            --group=default \
             --filter="$PHPBENCH_FILTER" \
             --progress=none \
             --warmup=1 \
@@ -92,6 +92,7 @@ jobs:
           set -euo pipefail
 
           vendor/bin/phpbench run \
+            --group=default \
             --filter="$PHPBENCH_FILTER" \
             --progress=none \
             --warmup=1 \
diff --git a/composer.json b/composer.json
index 6be6d7d..d139568 100644
--- a/composer.json
+++ b/composer.json
@@ -50,8 +50,9 @@
             "pint",
             "phpstan analyse"
         ],
-        "benchmark": "phpbench run --group=macro --warmup=1 --retry-threshold=5 --report=aggregate",
-        "benchmark:micro": "phpbench run --group=micro --warmup=1 --retry-threshold=5 --report=aggregate",
+        "benchmark": "phpbench run --group=default --warmup=1 --retry-threshold=5 --report=aggregate",
+        "benchmark:cache": "phpbench run --group=cache --warmup=1 --retry-threshold=5 --report=aggregate",
+        "benchmark:operations": "phpbench run --group=operations --warmup=1 --retry-threshold=5 --report=aggregate",
         "profile": "phpbench xdebug:profile"
     },
     "config": {
diff --git a/performance/README.md b/performance/README.md
index 3a392ab..6c03b9f 100644
--- a/performance/README.md
+++ b/performance/README.md
@@ -1,24 +1,28 @@
 # Benchmark suite
 
 ```bash
-composer benchmark          # macro group: the storefront theme and template caches
-composer benchmark:micro    # micro group: individual operations
+composer benchmark             # default group: the storefront theme
+composer benchmark:cache       # cache group: template-cache backends
+composer benchmark:operations  # operations group: individual operations
 php performance/profile-theme.php --output=profile.json
 ```
 
 ## What each group is for
 
-The two groups have different jobs, and conflating them is how a benchmark suite
+The three groups have different jobs, and conflating them is how a benchmark suite
 stops being useful.
 
-**`macro`** (`ThemeBench`, `TemplateCacheBench`) renders the storefront theme —
-29 templates across four pages. It answers *"did rendering get slower"* and
-nothing more. It cannot tell you *what* got slower, because a regression in any
-one tag is averaged across everything else. Don't expect it to localize.
+**`default`** (`ThemeBench`) renders the storefront theme — 29 templates across
+four pages. It answers *"did rendering get slower"* and nothing more. It cannot
+tell you *what* got slower, because a regression in any one tag is averaged
+across everything else. Don't expect it to localize.
 
-**`micro`** (`OperationBench`) measures single operations on tiny templates. This
-is where per-feature sensitivity lives, and where a benchmark is allowed to be
-unrealistic: an artificial template that does one thing 64 times is a better
+**`cache`** (`TemplateCacheBench`) measures compilation and fresh-environment
+loading for every supported template-cache backend.
+
+**`operations`** (`OperationBench`) measures single operations on tiny templates.
+This is where per-feature sensitivity lives, and where a benchmark is allowed to
+be unrealistic: an artificial template that does one thing 64 times is a better
 instrument than a realistic page.
 
 The split is what lets the theme be realistic. Whenever realism and measurement
@@ -40,7 +44,7 @@ Constraints that are not obvious from reading the code:
 - **`Database` assigns, it does not compute.** No scans, no reductions, no
   sorting. Nothing is memoized either, so the whole object graph is rebuilt on
   every render *inside the measured region* — any computation added here is paid
-  160 times per iteration and moves the macro numbers for reasons that have
+  160 times per iteration and moves the theme numbers for reasons that have
   nothing to do with the library. Derived values go into the literal data or
   onto a drop method, where they are measured as template work. Building the
   fixture measured **~6% of `ThemeBench::benchRender`** when this landed — nothing
@@ -88,27 +92,24 @@ until it asserts nothing. Strict mode cannot be silenced that way.
 
 Known gaps, in rough priority order:
 
-- **Per-tag `micro` subjects.** Nothing isolates `case`, `capture`, `cycle`,
+- **Per-tag `operations` subjects.** Nothing isolates `case`, `capture`, `cycle`,
   `render` depth, or property-vs-method resolution. Until this lands, the suite
   can see that something regressed but not what.
 - **The drop miss path.** The most expensive branch of `Drop::__get` (a
   `liquidMethodMissing` miss, up to three thrown exceptions) is unmeasured. It
-  belongs in `micro`, not the theme, because the theme must stay strict.
-- **The `liquidMethodMissing` *hit* path in `micro`.** `OperationBench`'s drop
+  belongs in `operations`, not the theme, because the theme must stay strict.
+- **The `liquidMethodMissing` *hit* path in `operations`.** `OperationBench`'s drop
   subjects used to run on `DatabaseDrop`, whose every lookup was a method-missing
   hit. They now use `ProductDrop`, so both subjects resolve a public property —
   the cheapest branch. The theme still exercises the hit path through
-  `MetafieldsDrop`, but no micro subject isolates it.
+  `MetafieldsDrop`, but no operations subject isolates it.
 - **Size-parameterized scaling.** With one fixed dataset, nothing distinguishes
   "everything is 10% slower" from "something became superlinear". A
   `ParamProviders` spread (4 / 24 / 96 products) would show the shape.
 - **Coverage-only tags.** `tablerow`, `increment`, `decrement`, `ifchanged`,
   `raw` and `doc` are unbenchmarked. Real themes barely use them, so they belong
-  in `micro` rather than in the theme.
+  in `operations` rather than in the theme.
 - **`TemplateCacheBench` shape.** Six subjects driven by six near-identical
   `setUp*` wrappers around a string `match` — this is what `ParamProviders`
   exists for. Its cache path is also a fixed `sys_get_temp_dir()` directory, so
   two concurrent runs collide.
-- **CI base run.** `.github/workflows/phpbench.yml` passes `--group=macro` to the
-  PR run but not the base run, so the base executes micro benchmarks too. It can
-  be aligned once `main` has the group attributes.
diff --git a/performance/benchmarks/OperationBench.php b/performance/benchmarks/OperationBench.php
index 30e37be..71a0fd0 100644
--- a/performance/benchmarks/OperationBench.php
+++ b/performance/benchmarks/OperationBench.php
@@ -14,7 +14,7 @@
 use PhpBench\Attributes\OutputTimeUnit;
 use PhpBench\Attributes\Revs;
 
-#[Groups(['micro'])]
+#[Groups(['operations'])]
 #[Iterations(10)]
 #[Revs(20)]
 #[OutputMode('throughput')]
diff --git a/performance/benchmarks/TemplateCacheBench.php b/performance/benchmarks/TemplateCacheBench.php
index a068144..e604668 100644
--- a/performance/benchmarks/TemplateCacheBench.php
+++ b/performance/benchmarks/TemplateCacheBench.php
@@ -16,7 +16,7 @@
 use PhpBench\Attributes\OutputTimeUnit;
 use PhpBench\Attributes\Revs;
 
-#[Groups(['macro'])]
+#[Groups(['cache'])]
 #[Iterations(10)]
 #[Revs(20)]
 #[OutputMode('throughput')]
diff --git a/performance/benchmarks/ThemeBench.php b/performance/benchmarks/ThemeBench.php
index c06b8fa..38ae932 100644
--- a/performance/benchmarks/ThemeBench.php
+++ b/performance/benchmarks/ThemeBench.php
@@ -16,13 +16,13 @@
  *
  * This class answers "did rendering get slower", not "what got slower": it
  * averages 29 templates across four pages, so it cannot localize a regression.
- * Per-feature sensitivity belongs in the micro group.
+ * Per-feature sensitivity belongs in the operations group.
  *
- * ponytail: the micro group has not caught up yet, so nothing in the suite
+ * ponytail: the operations group has not caught up yet, so nothing in the suite
  * isolates a single tag, the drop miss path, or superlinear growth. The deferred
  * list is in performance/README.md.
  */
-#[Groups(['macro'])]
+#[Groups(['default'])]
 #[Iterations(10)]
 #[Revs(20)]
 #[OutputMode('throughput')]

From b1d019e12929107b1182c18c908fea60294a4a2d Mon Sep 17 00:00:00 2001
From: Fabio Capucci <fabio.cappuc@gmail.com>
Date: Thu, 30 Jul 2026 14:46:49 +0200
Subject: [PATCH 11/11] Harden benchmark comparisons and expand workload
 coverage

- Scope storefront fixture data and discover templates automatically
- Add operation benchmarks and comparator regression tests
- Enforce a 5% CI regression threshold
---
 .github/workflows/phpbench.yml                |   3 +-
 performance/README.md                         |  52 +++---
 performance/Support/Database.php              |  30 ++++
 performance/Support/StorefrontTheme.php       | 159 ++++++++++--------
 performance/benchmarks/OperationBench.php     |  68 +++++++-
 performance/benchmarks/TemplateCacheBench.php |  17 +-
 performance/benchmarks/ThemeBench.php         |   9 +-
 .../Performance/StorefrontThemeTest.php       |  41 ++++-
 .../Unit/Performance/PhpBenchCompareTest.php  |  97 +++++++++++
 tools/phpbench-compare.php                    |  26 +++
 10 files changed, 390 insertions(+), 112 deletions(-)
 create mode 100644 tests/Unit/Performance/PhpBenchCompareTest.php

diff --git a/.github/workflows/phpbench.yml b/.github/workflows/phpbench.yml
index 08a0e11..d51f5dc 100644
--- a/.github/workflows/phpbench.yml
+++ b/.github/workflows/phpbench.yml
@@ -19,6 +19,7 @@ env:
   # the per-version comparison summaries incomparable with each other. Local runs are
   # unfiltered, so the benchmarks still exist — they just do not gate PRs.
   PHPBENCH_FILTER: '^(?!.*TemplateCacheBench::bench(Build|LoadAndRender)VarExporter$).*'
+  PHPBENCH_MAX_REG: '5'
 
 jobs:
   benchmark:
@@ -173,5 +174,5 @@ jobs:
             }
 
       - name: Enforce comparison failures
-        if: always() && steps.compare.outputs.exit_code != '0' && steps.compare.outputs.exit_code != '1'
+        if: always() && steps.compare.outputs.exit_code != '0'
         run: exit 1
diff --git a/performance/README.md b/performance/README.md
index 6c03b9f..93a0c27 100644
--- a/performance/README.md
+++ b/performance/README.md
@@ -29,6 +29,10 @@ The split is what lets the theme be realistic. Whenever realism and measurement
 sensitivity conflict inside the theme, realism wins — sensitivity is not the
 theme's job.
 
+Pull-request comparisons enforce a worst-subject throughput regression threshold
+of 5%. The comparator still labels changes inside its 2% noise band as neutral,
+and marks RSD above 5% as high variance for review.
+
 ## The storefront fixture
 
 `performance/themes/storefront/` is a deliberately plausible storefront: real
@@ -42,22 +46,19 @@ would use (`render`, `for`/`else`, `if`, `unless`, `case`, `capture`, `cycle`,
 Constraints that are not obvious from reading the code:
 
 - **`Database` assigns, it does not compute.** No scans, no reductions, no
-  sorting. Nothing is memoized either, so the whole object graph is rebuilt on
-  every render *inside the measured region* — any computation added here is paid
-  160 times per iteration and moves the theme numbers for reasons that have
-  nothing to do with the library. Derived values go into the literal data or
-  onto a drop method, where they are measured as template work. Building the
-  fixture measured **~6% of `ThemeBench::benchRender`** when this landed — nothing
-  asserts that, so treat it as a reference point rather than a guarantee. To
-  re-measure, time `StorefrontTheme::renderData()` twice per page (the layout gets
-  its own context) against `renderPage()` over the same pages.
+  sorting. Nothing is memoized either, so the page-local object graph is rebuilt
+  on every render *inside the measured region* — any computation added here moves
+  the theme numbers for reasons that have nothing to do with the library.
+  Derived values go into the literal data or onto a drop method, where they are
+  measured as template work. `StorefrontTheme::renderData()` builds page and
+  layout data once, sharing only the `shop` drop where both contexts need it.
 - **Fixed dataset: 24 products.** A deliberate page size, not an accident.
 - **Fresh drops per render.** `#[Cache]` therefore starts cold on every render,
   and no state is shared between revolutions. Memoized instances would measure a
   warm cache 95% of the time and leak `ContextAware` state across revs.
 - **Two render contexts per page.** The page renders into one, the layout into
-  another. Consequence: nothing under `layout/` may read a variable a template
-  assigned — it would render empty.
+  another, both from a single fixture setup. Consequence: nothing under `layout/`
+  may read a variable a template assigned — it would render empty.
 - **No missing lookups.** Every field the theme reads exists, so empty output in
   a benchmark is a bug rather than an expected state.
 - **Template sources are read in `setUp`,** never inside a subject. Reading 29
@@ -92,24 +93,17 @@ until it asserts nothing. Strict mode cannot be silenced that way.
 
 Known gaps, in rough priority order:
 
-- **Per-tag `operations` subjects.** Nothing isolates `case`, `capture`, `cycle`,
-  `render` depth, or property-vs-method resolution. Until this lands, the suite
-  can see that something regressed but not what.
-- **The drop miss path.** The most expensive branch of `Drop::__get` (a
-  `liquidMethodMissing` miss, up to three thrown exceptions) is unmeasured. It
-  belongs in `operations`, not the theme, because the theme must stay strict.
-- **The `liquidMethodMissing` *hit* path in `operations`.** `OperationBench`'s drop
-  subjects used to run on `DatabaseDrop`, whose every lookup was a method-missing
-  hit. They now use `ProductDrop`, so both subjects resolve a public property —
-  the cheapest branch. The theme still exercises the hit path through
-  `MetafieldsDrop`, but no operations subject isolates it.
-- **Size-parameterized scaling.** With one fixed dataset, nothing distinguishes
-  "everything is 10% slower" from "something became superlinear". A
-  `ParamProviders` spread (4 / 24 / 96 products) would show the shape.
+- **Additional per-tag `operations` subjects.** The suite isolates property,
+  method, `liquidMethodMissing` hit/miss, filters and list-size scaling, but it
+  does not yet isolate `case`, `capture`, `cycle` or `render` depth.
+- **Full-theme size scaling.** The operations group exposes 4 / 24 / 96-product
+  loop scaling, while the storefront theme deliberately keeps a fixed 24-product
+  dataset. A second full-theme size profile would be useful only if a suspected
+  regression needs that wider lens.
 - **Coverage-only tags.** `tablerow`, `increment`, `decrement`, `ifchanged`,
   `raw` and `doc` are unbenchmarked. Real themes barely use them, so they belong
   in `operations` rather than in the theme.
-- **`TemplateCacheBench` shape.** Six subjects driven by six near-identical
-  `setUp*` wrappers around a string `match` — this is what `ParamProviders`
-  exists for. Its cache path is also a fixed `sys_get_temp_dir()` directory, so
-  two concurrent runs collide.
+- **`TemplateCacheBench` shape.** Six subjects are driven by six near-identical
+  `setUp*` wrappers around a string `match`; `ParamProviders` could reduce that
+  repetition. Each benchmark setup now receives a unique temporary cache path,
+  so concurrent runs do not share cache files.
diff --git a/performance/Support/Database.php b/performance/Support/Database.php
index e437d26..a06a14c 100644
--- a/performance/Support/Database.php
+++ b/performance/Support/Database.php
@@ -323,6 +323,36 @@ public static function pageTitle(string $template): string
         };
     }
 
+    /**
+     * Page-local fixture data. The shared layout data is built separately so a
+     * page render only constructs the drops its own template can use.
+     *
+     * @return array<string, mixed>
+     */
+    public static function pageData(string $template, ShopDrop $shop): array
+    {
+        return match ($template) {
+            'index' => [
+                'shop' => $shop,
+                'collection' => self::collection(),
+                'articles' => self::articles(),
+            ],
+            'collection' => [
+                'collection' => self::collection(),
+                'products_per_page' => self::PRODUCTS_PER_PAGE,
+            ],
+            'product' => [
+                'collection' => self::collection(),
+                'product' => self::product(),
+            ],
+            'page' => [
+                'shop' => $shop,
+                'page' => self::page(),
+            ],
+            default => throw new \InvalidArgumentException("Unknown storefront page template [$template]."),
+        };
+    }
+
     public static function shop(): ShopDrop
     {
         return new ShopDrop(
diff --git a/performance/Support/StorefrontTheme.php b/performance/Support/StorefrontTheme.php
index e422ba8..1ccaa55 100644
--- a/performance/Support/StorefrontTheme.php
+++ b/performance/Support/StorefrontTheme.php
@@ -17,47 +17,13 @@
  */
 final class StorefrontTheme
 {
-    public const LAYOUT_TEMPLATE_NAME = 'layout.theme';
+    /** @var list<string>|null */
+    private static ?array $templateNames = null;
 
-    /**
-     * @var list<string>
-     */
-    private const PAGE_TEMPLATE_NAMES = [
-        'templates.index',
-        'templates.collection',
-        'templates.product',
-        'templates.page',
-    ];
+    /** @var list<string>|null */
+    private static ?array $pageTemplateNames = null;
 
-    /**
-     * @var list<string>
-     */
-    private const SNIPPET_TEMPLATE_NAMES = [
-        'snippets.shared.site_header',
-        'snippets.shared.site_footer',
-        'snippets.shared.meta_tags',
-        'snippets.shared.breadcrumbs',
-        'snippets.shared.button',
-        'snippets.shared.icon',
-        'snippets.shared.price',
-        'snippets.shared.newsletter',
-        'snippets.collection.header',
-        'snippets.collection.toolbar',
-        'snippets.collection.filters',
-        'snippets.collection.grid',
-        'snippets.index.hero',
-        'snippets.index.featured_products',
-        'snippets.index.journal',
-        'snippets.product.card',
-        'snippets.product.gallery',
-        'snippets.product.pricing',
-        'snippets.product.badges',
-        'snippets.product.variant_picker',
-        'snippets.product.specs',
-        'snippets.product.detail',
-        'snippets.page.header',
-        'snippets.page.content',
-    ];
+    private static ?string $layoutTemplateName = null;
 
     public static function themePath(): string
     {
@@ -84,11 +50,7 @@ public static function environment(): Environment
      */
     public static function templateNames(): array
     {
-        return [
-            self::LAYOUT_TEMPLATE_NAME,
-            ...self::PAGE_TEMPLATE_NAMES,
-            ...self::SNIPPET_TEMPLATE_NAMES,
-        ];
+        return self::$templateNames ??= self::discoverTemplateNames();
     }
 
     /**
@@ -96,7 +58,28 @@ public static function templateNames(): array
      */
     public static function pageTemplateNames(): array
     {
-        return self::PAGE_TEMPLATE_NAMES;
+        return self::$pageTemplateNames ??= array_values(array_filter(
+            self::templateNames(),
+            static fn (string $templateName): bool => str_starts_with($templateName, 'templates.'),
+        ));
+    }
+
+    public static function layoutTemplateName(): string
+    {
+        if (self::$layoutTemplateName !== null) {
+            return self::$layoutTemplateName;
+        }
+
+        $layouts = array_values(array_filter(
+            self::templateNames(),
+            static fn (string $templateName): bool => str_starts_with($templateName, 'layout.'),
+        ));
+
+        if (count($layouts) !== 1) {
+            throw new \RuntimeException('The storefront theme must contain exactly one layout template.');
+        }
+
+        return self::$layoutTemplateName = $layouts[0];
     }
 
     public static function templatePath(string $templateName): string
@@ -116,43 +99,48 @@ public static function templateSource(string $templateName): string
     }
 
     /**
-     * @return array<string, mixed>
+     * @return array{page: array<string, mixed>, layout: array<string, mixed>}
      */
     public static function renderData(string $pageTemplateName): array
     {
         $template = str_replace('templates.', '', $pageTemplateName);
+        $shop = Database::shop();
 
         return [
-            'shop' => Database::shop(),
-            'cart' => Database::cart(),
-            'linklists' => [
-                'main_menu' => Database::mainMenu(),
-                'footer' => Database::footerMenu(),
+            'page' => Database::pageData($template, $shop),
+            'layout' => [
+                'shop' => $shop,
+                'cart' => Database::cart(),
+                'linklists' => [
+                    'main_menu' => Database::mainMenu(),
+                    'footer' => Database::footerMenu(),
+                ],
+                'template' => $template,
+                'page_title' => Database::pageTitle($template),
             ],
-            'template' => $template,
-            'page_title' => Database::pageTitle($template),
-            'collection' => Database::collection(),
-            'product' => Database::product(),
-            'page' => Database::page(),
-            'articles' => Database::articles(),
-            'products_per_page' => Database::PRODUCTS_PER_PAGE,
         ];
     }
 
-    public static function newRenderContext(
+    /**
+     * @param  array<string, mixed>  $data
+     */
+    private static function newRenderContext(
         Environment $environment,
-        string $pageTemplateName,
+        array $data,
     ): RenderContext {
-        return $environment->newRenderContext(staticData: self::renderData($pageTemplateName));
+        return $environment->newRenderContext(staticData: $data);
     }
 
-    public static function newLayoutRenderContext(
+    /**
+     * @param  array<string, mixed>  $data
+     */
+    private static function newLayoutRenderContext(
         Environment $environment,
         mixed $content,
-        string $pageTemplateName,
+        array $data,
     ): RenderContext {
         return $environment->newRenderContext(staticData: [
-            ...self::renderData($pageTemplateName),
+            ...$data,
             'content_for_layout' => $content,
         ]);
     }
@@ -164,11 +152,12 @@ public static function newLayoutRenderContext(
      */
     public static function renderPage(Environment $environment, string $pageTemplateName): string
     {
+        $data = self::renderData($pageTemplateName);
         $content = $environment->parseTemplate($pageTemplateName)
-            ->render(self::newRenderContext($environment, $pageTemplateName));
+            ->render(self::newRenderContext($environment, $data['page']));
 
-        return $environment->parseTemplate(self::LAYOUT_TEMPLATE_NAME)
-            ->render(self::newLayoutRenderContext($environment, $content, $pageTemplateName));
+        return $environment->parseTemplate(self::layoutTemplateName())
+            ->render(self::newLayoutRenderContext($environment, $content, $data['layout']));
     }
 
     /**
@@ -176,10 +165,40 @@ public static function renderPage(Environment $environment, string $pageTemplate
      */
     public static function streamPage(Environment $environment, string $pageTemplateName): \Generator
     {
+        $data = self::renderData($pageTemplateName);
         $content = $environment->parseTemplate($pageTemplateName)
-            ->stream(self::newRenderContext($environment, $pageTemplateName));
+            ->stream(self::newRenderContext($environment, $data['page']));
+
+        return $environment->parseTemplate(self::layoutTemplateName())
+            ->stream(self::newLayoutRenderContext($environment, $content, $data['layout']));
+    }
+
+    /**
+     * @return list<string>
+     */
+    private static function discoverTemplateNames(): array
+    {
+        $templateNames = [];
+        $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(
+            self::themePath(),
+            \FilesystemIterator::SKIP_DOTS,
+        ));
+
+        foreach ($files as $file) {
+            if (! $file instanceof \SplFileInfo || ! $file->isFile() || $file->getExtension() !== 'liquid') {
+                continue;
+            }
+
+            $relativePath = substr($file->getPathname(), strlen(self::themePath()) + 1, -7);
+            $templateNames[] = str_replace(DIRECTORY_SEPARATOR, '.', $relativePath);
+        }
+
+        sort($templateNames);
+
+        if ($templateNames === []) {
+            throw new \RuntimeException('The storefront theme contains no Liquid templates.');
+        }
 
-        return $environment->parseTemplate(self::LAYOUT_TEMPLATE_NAME)
-            ->stream(self::newLayoutRenderContext($environment, $content, $pageTemplateName));
+        return $templateNames;
     }
 }
diff --git a/performance/benchmarks/OperationBench.php b/performance/benchmarks/OperationBench.php
index 71a0fd0..2c89c44 100644
--- a/performance/benchmarks/OperationBench.php
+++ b/performance/benchmarks/OperationBench.php
@@ -6,6 +6,7 @@
 use Keepsuit\Liquid\EnvironmentFactory;
 use Keepsuit\Liquid\Performance\Support\Database;
 use Keepsuit\Liquid\Performance\Support\Drops\ProductDrop;
+use Keepsuit\Liquid\Render\RenderContext;
 use Keepsuit\Liquid\Template;
 use PhpBench\Attributes\BeforeMethods;
 use PhpBench\Attributes\Groups;
@@ -32,6 +33,14 @@ class OperationBench
 
     private Template $filterWithArgumentsTemplate;
 
+    private Template $dropMethodTemplate;
+
+    private Template $dropMethodMissingHitTemplate;
+
+    private Template $dropMethodMissingMissTemplate;
+
+    private Template $productListTemplate;
+
     /**
      * Built in setUp, not in the subject: these two subjects measure how
      * Drop::__get resolves a property, and constructing a ProductDrop (variants,
@@ -41,6 +50,9 @@ class OperationBench
      */
     private ProductDrop $productDrop;
 
+    /** @var ProductDrop[] */
+    protected array $productList;
+
     public function setUp(): void
     {
         $this->environment = EnvironmentFactory::new()->build();
@@ -48,7 +60,12 @@ public function setUp(): void
         $this->nestedTemplate = $this->environment->parseString(str_repeat('{{ product.title }}', 64));
         $this->filterWithoutArgumentsTemplate = $this->environment->parseString(str_repeat('{{ value | upcase | escape }}', 32));
         $this->filterWithArgumentsTemplate = $this->environment->parseString(str_repeat('{{ value | append: suffix | replace: from, to }}', 32));
+        $this->dropMethodTemplate = $this->environment->parseString(str_repeat('{{ product.url }}', 64));
+        $this->dropMethodMissingHitTemplate = $this->environment->parseString(str_repeat('{{ product.metafields.material }}', 64));
+        $this->dropMethodMissingMissTemplate = $this->environment->parseString(str_repeat('{{ product.metafields.unknown }}', 64));
+        $this->productListTemplate = $this->environment->parseString('{% for product in products %}{{ product.title }}{% endfor %}');
         $this->productDrop = Database::product();
+        $this->productList = Database::products();
     }
 
     public function benchScalarRender(): void
@@ -93,6 +110,50 @@ public function benchDropStream(): void
         )));
     }
 
+    public function benchDropMethodRender(): void
+    {
+        $this->dropMethodTemplate->render($this->productContext());
+    }
+
+    public function benchDropMethodStream(): void
+    {
+        $this->drain($this->dropMethodTemplate->stream($this->productContext()));
+    }
+
+    public function benchDropMethodMissingHitRender(): void
+    {
+        $this->dropMethodMissingHitTemplate->render($this->productContext());
+    }
+
+    public function benchDropMethodMissingHitStream(): void
+    {
+        $this->drain($this->dropMethodMissingHitTemplate->stream($this->productContext()));
+    }
+
+    public function benchDropMethodMissingMissRender(): void
+    {
+        $this->dropMethodMissingMissTemplate->render($this->productContext());
+    }
+
+    public function benchDropMethodMissingMissStream(): void
+    {
+        $this->drain($this->dropMethodMissingMissTemplate->stream($this->productContext()));
+    }
+
+    public function benchProductListRender(): void
+    {
+        $this->productListTemplate->render($this->environment->newRenderContext(
+            staticData: ['products' => $this->productList],
+        ));
+    }
+
+    public function benchProductListStream(): void
+    {
+        $this->drain($this->productListTemplate->stream($this->environment->newRenderContext(
+            staticData: ['products' => $this->productList],
+        )));
+    }
+
     public function benchFilterWithoutArguments(): void
     {
         $this->filterWithoutArgumentsTemplate->render($this->filterContext());
@@ -113,7 +174,7 @@ private function drain(\Generator $stream): void
         }
     }
 
-    private function filterContext(): \Keepsuit\Liquid\Render\RenderContext
+    private function filterContext(): RenderContext
     {
         return $this->environment->newRenderContext(staticData: [
             'value' => 'example',
@@ -122,4 +183,9 @@ private function filterContext(): \Keepsuit\Liquid\Render\RenderContext
             'to' => 'value',
         ]);
     }
+
+    private function productContext(): RenderContext
+    {
+        return $this->environment->newRenderContext(staticData: ['product' => $this->productDrop]);
+    }
 }
diff --git a/performance/benchmarks/TemplateCacheBench.php b/performance/benchmarks/TemplateCacheBench.php
index e604668..0d7c3c4 100644
--- a/performance/benchmarks/TemplateCacheBench.php
+++ b/performance/benchmarks/TemplateCacheBench.php
@@ -30,6 +30,14 @@ class TemplateCacheBench
 
     private LiquidTemplatesCache $cache;
 
+    /** @var list<string> */
+    private array $templateNames;
+
+    /** @var list<string> */
+    private array $pageTemplateNames;
+
+    private string $cacheDirectory;
+
     #[BeforeMethods('setUpInMemoryBuild')]
     public function benchBuildInMemory(): void
     {
@@ -103,6 +111,9 @@ public function clearCache(): void
 
     private function setUpBuild(string $backend): void
     {
+        $this->templateNames = StorefrontTheme::templateNames();
+        $this->pageTemplateNames = StorefrontTheme::pageTemplateNames();
+        $this->cacheDirectory = sys_get_temp_dir().'/'.self::CACHE_DIRECTORY.'-'.bin2hex(random_bytes(8));
         $this->cache = $this->newCache($backend);
         $this->cache->clear();
         $this->environment = StorefrontTheme::environmentFactory()->setTemplatesCache($this->cache)->build();
@@ -121,7 +132,7 @@ private function setUpCachedRender(string $backend): void
 
     private function compileStaticTheme(Environment $environment): void
     {
-        foreach (StorefrontTheme::templateNames() as $templateName) {
+        foreach ($this->templateNames as $templateName) {
             $environment->parseTemplate($templateName);
         }
     }
@@ -134,7 +145,7 @@ private function buildStaticTheme(): void
 
     private function renderCachedTheme(): void
     {
-        foreach (StorefrontTheme::pageTemplateNames() as $templateName) {
+        foreach ($this->pageTemplateNames as $templateName) {
             StorefrontTheme::renderPage($this->environment, $templateName);
         }
     }
@@ -151,6 +162,6 @@ private function newCache(string $backend): LiquidTemplatesCache
 
     private function cachePath(string $backend): string
     {
-        return sys_get_temp_dir().'/'.self::CACHE_DIRECTORY.'/'.$backend;
+        return $this->cacheDirectory.'/'.$backend;
     }
 }
diff --git a/performance/benchmarks/ThemeBench.php b/performance/benchmarks/ThemeBench.php
index 38ae932..a327ab8 100644
--- a/performance/benchmarks/ThemeBench.php
+++ b/performance/benchmarks/ThemeBench.php
@@ -40,6 +40,9 @@ class ThemeBench
      */
     private array $sources;
 
+    /** @var list<string> */
+    private array $pageTemplateNames;
+
     public function setUp(): void
     {
         $this->environment = StorefrontTheme::environment();
@@ -49,6 +52,8 @@ public function setUp(): void
             $this->environment->parseTemplate($name);
             $this->sources[$name] = StorefrontTheme::templateSource($name);
         }
+
+        $this->pageTemplateNames = StorefrontTheme::pageTemplateNames();
     }
 
     public function benchTokenize(): void
@@ -67,14 +72,14 @@ public function benchParse(): void
 
     public function benchRender(): void
     {
-        foreach (StorefrontTheme::pageTemplateNames() as $pageTemplateName) {
+        foreach ($this->pageTemplateNames as $pageTemplateName) {
             StorefrontTheme::renderPage($this->environment, $pageTemplateName);
         }
     }
 
     public function benchStream(): void
     {
-        foreach (StorefrontTheme::pageTemplateNames() as $pageTemplateName) {
+        foreach ($this->pageTemplateNames as $pageTemplateName) {
             foreach (StorefrontTheme::streamPage($this->environment, $pageTemplateName) as $chunk) {
             }
         }
diff --git a/tests/Integration/Performance/StorefrontThemeTest.php b/tests/Integration/Performance/StorefrontThemeTest.php
index fa4b5f5..b82a88c 100644
--- a/tests/Integration/Performance/StorefrontThemeTest.php
+++ b/tests/Integration/Performance/StorefrontThemeTest.php
@@ -19,12 +19,12 @@ function storefrontStrictEnvironment(): Keepsuit\Liquid\Environment
         ->build();
 }
 
-test('every declared template exists and every template on disk is declared', function () {
-    $declared = StorefrontTheme::templateNames();
+test('every discovered template exists and every template on disk is discovered', function () {
+    $discovered = StorefrontTheme::templateNames();
 
-    expect($declared)->toHaveCount(29);
+    expect($discovered)->toHaveCount(29);
 
-    foreach ($declared as $templateName) {
+    foreach ($discovered as $templateName) {
         expect(StorefrontTheme::templatePath($templateName))->toBeReadableFile();
     }
 
@@ -42,10 +42,10 @@ function storefrontStrictEnvironment(): Keepsuit\Liquid\Environment
     }
 
     sort($onDisk);
-    $expected = $declared;
+    $expected = $discovered;
     sort($expected);
 
-    // An undeclared template is invisible to the parse benchmarks, so it would be
+    // An undiscovered template is invisible to the parse benchmarks, so it would be
     // silently excluded from every measurement.
     expect($onDisk)->toBe($expected);
 });
@@ -73,6 +73,35 @@ function storefrontStrictEnvironment(): Keepsuit\Liquid\Environment
     }
 });
 
+test('page and layout data stay scoped to their own template work', function () {
+    $indexData = StorefrontTheme::renderData('templates.index');
+    $productData = StorefrontTheme::renderData('templates.product');
+
+    expect($indexData['page'])->toHaveKeys(['shop', 'collection', 'articles'])
+        ->not->toHaveKeys(['cart', 'linklists', 'product', 'page'])
+        ->and($productData['page'])->toHaveKeys(['collection', 'product'])
+        ->not->toHaveKeys(['shop', 'cart', 'linklists', 'articles', 'page'])
+        ->and($indexData['layout'])->toHaveKeys(['shop', 'cart', 'linklists', 'template', 'page_title'])
+        ->and($indexData['layout']['shop'])->toBe($indexData['page']['shop']);
+});
+
+test('every page keeps its page-specific partial workload', function () {
+    $environment = storefrontStrictEnvironment();
+
+    foreach ([
+        'templates.index' => ['class="hero"', 'Packing light for a weekend away'],
+        'templates.collection' => ['class="collection-filters"', 'class="product-grid"'],
+        'templates.product' => ['class="variant-picker"', '<caption>Details</caption>'],
+        'templates.page' => ['class="page-content__section"', 'Contact us'],
+    ] as $templateName => $markers) {
+        $rendered = StorefrontTheme::renderPage($environment, $templateName);
+
+        expect($rendered)
+            ->toContain($markers[0])
+            ->toContain($markers[1]);
+    }
+});
+
 test('streaming a page produces the same bytes as rendering it', function () {
     $environment = storefrontStrictEnvironment();
 
diff --git a/tests/Unit/Performance/PhpBenchCompareTest.php b/tests/Unit/Performance/PhpBenchCompareTest.php
new file mode 100644
index 0000000..efa7692
--- /dev/null
+++ b/tests/Unit/Performance/PhpBenchCompareTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * @return array{benchmark: string, subject: string, set: string, its: int, revs: int, mode: float, mem_peak: int, rstdev: float}
+ */
+function phpBenchAggregateRow(int $iterations = 10, int $revolutions = 20, float $mode = 1000.0): array
+{
+    return [
+        'benchmark' => 'ThemeBench',
+        'subject' => 'benchRender',
+        'set' => '',
+        'its' => $iterations,
+        'revs' => $revolutions,
+        'mode' => $mode,
+        'mem_peak' => 1_024,
+        'rstdev' => 1.0,
+    ];
+}
+
+/**
+ * @param  list<array<string, int|float|string>>  $base
+ * @param  list<array<string, int|float|string>>  $pr
+ * @return array{exit_code: int, stdout: string, stderr: string}
+ */
+function runPhpBenchCompare(array $base, array $pr, ?string $threshold = null): array
+{
+    $directory = sys_get_temp_dir().'/php-liquid-phpbench-'.bin2hex(random_bytes(6));
+    mkdir($directory);
+    $basePath = $directory.'/base.json';
+    $prPath = $directory.'/pr.json';
+    file_put_contents($basePath, json_encode($base, JSON_THROW_ON_ERROR));
+    file_put_contents($prPath, json_encode($pr, JSON_THROW_ON_ERROR));
+
+    $command = implode(' ', [
+        escapeshellarg(PHP_BINARY),
+        escapeshellarg(dirname(__DIR__, 3).'/tools/phpbench-compare.php'),
+        escapeshellarg($basePath),
+        escapeshellarg($prPath),
+    ]);
+    $environment = $threshold === null
+        ? null
+        : [...getenv(), 'PHPBENCH_MAX_REG' => $threshold];
+
+    $process = proc_open($command, [
+        1 => ['pipe', 'w'],
+        2 => ['pipe', 'w'],
+    ], $pipes, null, $environment);
+
+    if (! is_resource($process)) {
+        throw new RuntimeException('Could not run the PHPBench comparator.');
+    }
+
+    $stdout = stream_get_contents($pipes[1]);
+    $stderr = stream_get_contents($pipes[2]);
+    fclose($pipes[1]);
+    fclose($pipes[2]);
+    $exitCode = proc_close($process);
+
+    unlink($basePath);
+    unlink($prPath);
+    rmdir($directory);
+
+    return [
+        'exit_code' => $exitCode,
+        'stdout' => $stdout,
+        'stderr' => $stderr,
+    ];
+}
+
+test('the PHPBench comparator enforces its configured regression threshold', function () {
+    $result = runPhpBenchCompare(
+        base: [phpBenchAggregateRow(mode: 1000.0)],
+        pr: [phpBenchAggregateRow(mode: 1100.0)],
+        threshold: '5',
+    );
+
+    expect($result['exit_code'])->toBe(1)
+        ->and($result['stdout'])->toContain('Threshold status: **FAILED**');
+});
+
+test('the PHPBench comparator rejects rows with different sample settings', function () {
+    $result = runPhpBenchCompare(
+        base: [phpBenchAggregateRow(iterations: 10, revolutions: 20)],
+        pr: [phpBenchAggregateRow(iterations: 20, revolutions: 20)],
+    );
+
+    expect($result['exit_code'])->toBe(2)
+        ->and($result['stdout'])->toContain('Incomparable benchmark rows')
+        ->toContain('base: 10 iterations x 20 revs; PR: 20 iterations x 20 revs');
+});
+
+test('the PHPBench comparator rejects malformed aggregate JSON', function () {
+    $result = runPhpBenchCompare(base: [[]], pr: [phpBenchAggregateRow()]);
+
+    expect($result['exit_code'])->toBe(2)
+        ->and($result['stderr'])->toContain('Unexpected PHPBench aggregate JSON');
+});
diff --git a/tools/phpbench-compare.php b/tools/phpbench-compare.php
index e9cc29f..3825012 100644
--- a/tools/phpbench-compare.php
+++ b/tools/phpbench-compare.php
@@ -21,6 +21,32 @@
     exit(0);
 }
 
+$configurationMismatches = [];
+foreach ($sharedNames as $name) {
+    $base = $baseBenchmarks[$name];
+    $pr = $prBenchmarks[$name];
+
+    if ($base['iterations'] !== $pr['iterations'] || $base['revolutions'] !== $pr['revolutions']) {
+        $configurationMismatches[] = sprintf(
+            '`%s` (base: %d iterations x %d revs; PR: %d iterations x %d revs)',
+            $name,
+            $base['iterations'],
+            $base['revolutions'],
+            $pr['iterations'],
+            $pr['revolutions'],
+        );
+    }
+}
+
+if ($configurationMismatches !== []) {
+    echo "> Incomparable benchmark rows: PHPBench iteration/revolution settings changed. Establish a matching baseline on `main`.\n\n";
+    foreach ($configurationMismatches as $configurationMismatch) {
+        echo "- {$configurationMismatch}\n";
+    }
+
+    exit(2);
+}
+
 // Runner jitter is routinely ±2%, so a single median over every benchmark is
 // meaningless when the set is bimodal (big winners + flat benchmarks): the middle
 // element lands on whichever side happens to hold more rows. Bucket instead, and