diff --git a/blocks/footer.ninjatpl b/blocks/footer.ninjatpl
index 06a5206..31898e5 100644
--- a/blocks/footer.ninjatpl
+++ b/blocks/footer.ninjatpl
@@ -1,7 +1,7 @@
 <section data-block="art-deco:footer" class="py-12 deco-grain">
 	<div class="max-w-3xl mx-auto px-4 text-center">
 		<hr class="deco-rule mb-8">
-		{% if address %}<address class="not-italic mb-4" style="color: hsl(var(--muted-foreground));"><div>{{ address }}</div></address>{% endif %}
+		{% if address %}<address class="not-italic mb-4" style="color: hsl(var(--muted-foreground));">{% for line in address|lines %}<div>{{ line }}</div>{% endfor %}</address>{% endif %}
 		{% if reservationsEmail %}<p class="mb-4"><a href="mailto:{{ reservationsEmail }}" class="deco-link">{{ reservationsEmail }}</a></p>{% endif %}
 		{% if menuName %}<nav aria-label="Footer" class="deco-caps text-xs mb-4" style="font-family: var(--font-heading, &quot;Italiana&quot;, &quot;Cinzel&quot;, Georgia, serif); color: hsl(var(--foreground));"><span>{{ menuName }}</span></nav>{% endif %}
 		{% if showSocial != "false" %}<div class="flex justify-center gap-4 mb-4" style="color: hsl(var(--primary));"><span class="deco-caps text-xs" aria-hidden="true">Instagram</span><span aria-hidden="true">·</span><span class="deco-caps text-xs" aria-hidden="true">Facebook</span><span aria-hidden="true">·</span><span class="deco-caps text-xs" aria-hidden="true">LinkedIn</span></div>{% endif %}
diff --git a/templates/email/art-deco.ninjatpl b/templates/email/art-deco.ninjatpl
index 8ad3c74..1dcc89a 100644
--- a/templates/email/art-deco.ninjatpl
+++ b/templates/email/art-deco.ninjatpl
@@ -14,7 +14,7 @@
 				</xml>
 			</noscript>
 			<![endif]-->
-		<title>{{ site.name }}</title>
+		<title>{{ site_name }}</title>
 		<style type="text/css">
 				body, table, td, p, a, li, blockquote {
 					-webkit-text-size-adjust: 100%;
@@ -39,7 +39,7 @@
 						<tr>
 							<td align="center" style="padding: 0; background-color: {{ colors.foreground }};">
 								<img src="data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20600%2080%22%3E%3Crect%20width%3D%22600%22%20height%3D%2280%22%20fill%3D%22%23191510%22%2F%3E%3Cg%20stroke%3D%22%23{{ colors.primary|default:"#c9a14a"|cut:"#" }}%22%20stroke-width%3D%221%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M300%2080%20L%20100%2010%22%2F%3E%3Cpath%20d%3D%22M300%2080%20L%20180%2010%22%2F%3E%3Cpath%20d%3D%22M300%2080%20L%20260%2010%22%2F%3E%3Cpath%20d%3D%22M300%2080%20L%20340%2010%22%2F%3E%3Cpath%20d%3D%22M300%2080%20L%20420%2010%22%2F%3E%3Cpath%20d%3D%22M300%2080%20L%20500%2010%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E" alt="" width="600" height="80" style="display: block; width: 100%; max-width: 600px; height: 80px; background-color: {{ colors.foreground }};">
-								{% if site.name %}<h1 style="margin: 0; padding: 24px 16px; font-family: &amp;#39;Italiana&amp;#39;, &amp;#39;Cinzel&amp;#39;, Georgia, serif; font-size: 28px; text-transform: uppercase; letter-spacing: 0.18em; color: {{ colors.primary }};">{{ site.name }}</h1>{% endif %}
+								{% if site_name %}<h1 style="margin: 0; padding: 24px 16px; font-family: &amp;#39;Italiana&amp;#39;, &amp;#39;Cinzel&amp;#39;, Georgia, serif; font-size: 28px; text-transform: uppercase; letter-spacing: 0.18em; color: {{ colors.primary }};">{{ site_name }}</h1>{% endif %}
 							</td>
 						</tr>
 						<tr>
@@ -49,11 +49,11 @@
 							<td style="padding: 0 48px;"><hr style="border: none; border-top: 1px solid {{ colors.primary }}; margin: 0;"></td>
 						</tr>
 						<tr>
-							<td align="center" style="padding: 24px 48px; color: {{ colors.muted_foreground }}; font-size: 13px;">
-								<p style="margin: 0 0 8px; font-family: &amp;#39;Italiana&amp;#39;, &amp;#39;Cinzel&amp;#39;, Georgia, serif; text-transform: uppercase; letter-spacing: 0.18em; color: {{ colors.foreground }};">{{ site.name }}</p>
-								{% if site.url %}<p style="margin: 0 0 8px;"><a href="{{ site.url }}" style="color: {{ colors.primary }}; text-decoration: none; border-bottom: 1px solid {{ colors.primary }};">{{ site.url }}</a></p>{% endif %}
-								{% if site.support_email %}<p style="margin: 12px 0 0; font-style: italic; color: {{ colors.muted_foreground }};">P.S. Reservations &amp; enquiries: {{ site.support_email }}</p>{% endif %}
-								{% if unsubscribe_url %}<p style="margin: 16px 0 0; font-size: 11px;"><a href="{{ unsubscribe_url }}" style="color: {{ colors.muted_foreground }}; text-decoration: none;">Unsubscribe</a></p>{% endif %}
+							<td align="center" style="padding: 24px 48px; color: {{ colors.mutedForeground }}; font-size: 13px;">
+								<p style="margin: 0 0 8px; font-family: &amp;#39;Italiana&amp;#39;, &amp;#39;Cinzel&amp;#39;, Georgia, serif; text-transform: uppercase; letter-spacing: 0.18em; color: {{ colors.foreground }};">{{ site_name }}</p>
+								{% if site_url %}<p style="margin: 0 0 8px;"><a href="{{ site_url }}" style="color: {{ colors.primary }}; text-decoration: none; border-bottom: 1px solid {{ colors.primary }};">{{ site_url }}</a></p>{% endif %}
+								{% if support_email %}<p style="margin: 12px 0 0; font-style: italic; color: {{ colors.mutedForeground }};">P.S. Reservations &amp; enquiries: {{ support_email }}</p>{% endif %}
+								{% if unsubscribe_url %}<p style="margin: 16px 0 0; font-size: 11px;"><a href="{{ unsubscribe_url }}" style="color: {{ colors.mutedForeground }}; text-decoration: none;">Unsubscribe</a></p>{% endif %}
 							</td>
 						</tr>
 					</table>