diff --git a/assets/style.css b/assets/style.css
index dd435f8..1f771bb 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -182,29 +182,13 @@ body.coffee-paper {
 }
 
 /* --- Layout helpers ------------------------------------------------------
- * Explicit CSS so these layouts never depend on the host Tailwind JIT
- * compiling arbitrary/responsive utilities out of THEME templates — it does
- * not scan them reliably, so `min-h-[50vh]` / `md:grid-cols-[2fr_3fr]` /
- * `md:grid-cols-2` in a theme file can silently vanish. Base is always a
- * single column, so grids collapse on mobile regardless of the JIT. */
-.coffee-minh-50 { min-height: 50vh; }
-.coffee-minh-75 { min-height: 75vh; }
-.coffee-minh-screen { min-height: 100vh; }
-.coffee-minh-400 { min-height: 400px; }
-.coffee-minh-320 { min-height: 320px; }
-
-.coffee-split-2 { display: grid; grid-template-columns: 1fr; }
+ * coffee-pour-grid keeps an explicit md 2fr:3fr split — a non-standard grid
+ * ratio with no plain Tailwind utility. Single-column base collapses on
+ * mobile. */
 .coffee-pour-grid { display: grid; grid-template-columns: 1fr; gap: 1.5rem; }
-.coffee-menu-grid { display: grid; grid-template-columns: 1fr; gap: 2.5rem 3rem; }
-.coffee-info-grid { display: grid; grid-template-columns: 1fr; gap: 2.5rem; }
 
 @media (min-width: 768px) {
     .coffee-pour-grid { grid-template-columns: 2fr 3fr; align-items: center; }
-    .coffee-menu-grid.coffee-menu-grid--2 { grid-template-columns: 1fr 1fr; }
-    .coffee-info-grid.coffee-info-grid--2 { grid-template-columns: 1fr 1fr; }
-}
-@media (min-width: 1024px) {
-    .coffee-split-2 { grid-template-columns: 1fr 1fr; }
 }
 
 /* --- Price + spec chips ------------------------------------------------- */
diff --git a/manifest.yaml b/manifest.yaml
index d1f94d3..72344ae 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -290,29 +290,15 @@ css:
     }
     
     /* --- Layout helpers ------------------------------------------------------
-     * Explicit CSS so these layouts never depend on the host Tailwind JIT
-     * compiling arbitrary/responsive utilities out of THEME templates — it does
-     * not scan them reliably, so `min-h-[50vh]` / `md:grid-cols-[2fr_3fr]` /
-     * `md:grid-cols-2` in a theme file can silently vanish. Base is always a
-     * single column, so grids collapse on mobile regardless of the JIT. */
-    .coffee-minh-50 { min-height: 50vh; }
-    .coffee-minh-75 { min-height: 75vh; }
-    .coffee-minh-screen { min-height: 100vh; }
-    .coffee-minh-400 { min-height: 400px; }
-    .coffee-minh-320 { min-height: 320px; }
-
-    .coffee-split-2 { display: grid; grid-template-columns: 1fr; }
+     * coffee-pour-grid keeps an explicit md 2fr:3fr split — a non-standard grid
+     * ratio with no plain Tailwind utility. Single-column base collapses on
+     * mobile. (The min-height + standard-column grid helpers that used to live
+     * here are now plain Tailwind utilities in the templates, since the host
+     * build scans theme .ninjatpl files.) */
     .coffee-pour-grid { display: grid; grid-template-columns: 1fr; gap: 1.5rem; }
-    .coffee-menu-grid { display: grid; grid-template-columns: 1fr; gap: 2.5rem 3rem; }
-    .coffee-info-grid { display: grid; grid-template-columns: 1fr; gap: 2.5rem; }
 
     @media (min-width: 768px) {
         .coffee-pour-grid { grid-template-columns: 2fr 3fr; align-items: center; }
-        .coffee-menu-grid.coffee-menu-grid--2 { grid-template-columns: 1fr 1fr; }
-        .coffee-info-grid.coffee-info-grid--2 { grid-template-columns: 1fr 1fr; }
-    }
-    @media (min-width: 1024px) {
-        .coffee-split-2 { grid-template-columns: 1fr 1fr; }
     }
 
     /* --- Price + spec chips ------------------------------------------------- */
diff --git a/templates/overrides/coffee/hero.ninjatpl b/templates/overrides/coffee/hero.ninjatpl
index 4fae2af..f306857 100644
--- a/templates/overrides/coffee/hero.ninjatpl
+++ b/templates/overrides/coffee/hero.ninjatpl
@@ -22,14 +22,14 @@
 {% if trustLogos %}<div class="mt-10"><p class="coffee-hand mb-3 text-lg text-accent">Regulars love</p><div class="flex flex-wrap items-center gap-6{% if align == "center" %} justify-center{% endif %}">{% for logo in trustLogos %}{% if logo.url %}<a href="{{ logo.url }}" target="_blank" rel="noopener" class="opacity-60 transition-opacity hover:opacity-100">{% img logo.image alt=logo.alt class="h-8 w-auto" %}</a>{% else %}{% img logo.image alt=logo.alt class="h-8 w-auto opacity-60" %}{% endif %}{% endfor %}</div></div>{% endif %}
 {% endmacro %}
 {% if variant == "split" %}
-<section class="hero coffee-split-2 overflow-hidden bg-background text-foreground{% if class %} {{ class }}{% endif %}">
-<div class="coffee-minh-320 relative bg-secondary {% if mediaPosition == "left" %}order-1 lg:order-1{% else %}order-1 lg:order-2{% endif %}">{% if hasImage %}{% img backgroundImage alt=headlineText class="absolute inset-0 h-full w-full object-cover" layout="hero" %}{% endif %}</div>
+<section class="hero grid grid-cols-1 lg:grid-cols-2 overflow-hidden bg-background text-foreground{% if class %} {{ class }}{% endif %}">
+<div class="min-h-[320px] relative bg-secondary {% if mediaPosition == "left" %}order-1 lg:order-1{% else %}order-1 lg:order-2{% endif %}">{% if hasImage %}{% img backgroundImage alt=headlineText class="absolute inset-0 h-full w-full object-cover" layout="hero" %}{% endif %}</div>
 <div class="flex flex-col justify-center px-6 py-16 lg:px-12 {% if mediaPosition == "left" %}order-2 lg:order-2{% else %}order-2 lg:order-1{% endif %}"><div class="max-w-lg text-left">{{ herocontent("left") }}</div></div>
 </section>
 {% else %}
 {% set align = "center" %}
 {% if variant == "left-aligned" %}{% set align = "left" %}{% endif %}
-<section class="hero relative flex flex-col overflow-hidden bg-background text-foreground {% if minHeight == "screen" %}coffee-minh-screen{% elif minHeight == "50vh" %}coffee-minh-50{% elif minHeight == "auto" %}coffee-minh-400{% else %}coffee-minh-75{% endif %} {% if verticalAlign == "top" %}justify-start pt-20{% elif verticalAlign == "bottom" %}justify-end pb-20{% else %}justify-center{% endif %}{% if class %} {{ class }}{% endif %}">
+<section class="hero relative flex flex-col overflow-hidden bg-background text-foreground {% if minHeight == "screen" %}min-h-screen{% elif minHeight == "50vh" %}min-h-[50vh]{% elif minHeight == "auto" %}min-h-[400px]{% else %}min-h-[75vh]{% endif %} {% if verticalAlign == "top" %}justify-start pt-20{% elif verticalAlign == "bottom" %}justify-end pb-20{% else %}justify-center{% endif %}{% if class %} {{ class }}{% endif %}">
 {% if hasImage %}<div class="absolute inset-0 z-0">{% img backgroundImage alt=headlineText class="h-full w-full object-cover" layout="hero" %}{% if showOverlay %}<div class="absolute inset-0 {% if overlayColor == "light" %}bg-background/60{% elif overlayColor == "primary" %}bg-primary/50{% elif overlayOpacity <= 30 %}bg-black/30{% elif overlayOpacity <= 50 %}bg-black/50{% elif overlayOpacity <= 70 %}bg-black/70{% else %}bg-black/80{% endif %}"></div>{% endif %}</div>{% endif %}
 <div class="relative z-10 mx-auto w-full max-w-4xl px-4 sm:px-6 lg:px-8 {% if variant == "left-aligned" %}text-left{% else %}text-center{% endif %}">{{ herocontent(align) }}</div>
 </section>
diff --git a/templates/overrides/coffee/hours-location.ninjatpl b/templates/overrides/coffee/hours-location.ninjatpl
index 9abb39c..5045c63 100644
--- a/templates/overrides/coffee/hours-location.ninjatpl
+++ b/templates/overrides/coffee/hours-location.ninjatpl
@@ -1,7 +1,7 @@
 <section class="py-16 md:py-24 bg-background text-foreground{% if class %} {{ class }}{% endif %}">
   <div class="mx-auto max-w-5xl px-4">
     {% if heading %}<h2 class="coffee-display text-3xl text-primary md:text-4xl"><span class="coffee-doodle-underline">{{ heading }}</span></h2>{% endif %}
-    <div class="coffee-info-grid{% if mapEmbedUrl %} coffee-info-grid--2{% endif %} mt-10">
+    <div class="grid grid-cols-1 gap-10{% if mapEmbedUrl %} md:grid-cols-2{% endif %} mt-10">
       <div>
         {% if hours %}
         <table class="coffee-body w-full text-sm" data-coffee-hours>
diff --git a/templates/overrides/coffee/menu-list.ninjatpl b/templates/overrides/coffee/menu-list.ninjatpl
index 390d623..c18fec4 100644
--- a/templates/overrides/coffee/menu-list.ninjatpl
+++ b/templates/overrides/coffee/menu-list.ninjatpl
@@ -3,7 +3,7 @@
     {% if heading %}<h2 class="coffee-display text-3xl text-primary md:text-4xl"><span class="coffee-doodle-underline">{{ heading }}</span></h2>{% endif %}
     {% if intro %}<p class="coffee-body mt-3 max-w-2xl text-lg text-muted-foreground">{{ intro }}</p>{% endif %}
     <div class="coffee-chalkboard mt-10 p-6 md:p-10">
-      <div class="coffee-menu-grid{% if columns == 2 %} coffee-menu-grid--2{% endif %}">
+      <div class="grid grid-cols-1 gap-x-12 gap-y-10{% if columns == 2 %} md:grid-cols-2{% endif %}">
         {% for section in sections %}
         <div class="menu-section">
           {% if section.title %}<h3 class="coffee-hand border-b coffee-chalk-rule pb-2 text-3xl">{{ section.title }}</h3>{% endif %}