diff --git a/templates/overrides/kindergarten/hero.ninjatpl b/templates/overrides/kindergarten/hero.ninjatpl
index 48793e0..86e81e2 100644
--- a/templates/overrides/kindergarten/hero.ninjatpl
+++ b/templates/overrides/kindergarten/hero.ninjatpl
@@ -1,8 +1,8 @@
 {# hero kindergarten override (GO-BIG showpiece): a bouncing mascot, wiggling ABC letters, and a dependency-free confetti canvas fill the panel when there is no backgroundImage. The canvas lazy-inits on view, honours prefers-reduced-motion, and degrades to a static confetti wash with JS off. Sizing + typography are driven by compiled .kg-hero* CSS (NOT min-h-screen / responsive Tailwind, which the host JIT drops on a cold provision). All builtin field reads are preserved from the default hero. #}
-{% set eyebrowText = eyebrow.text|default:eyebrow %}
-{% set headlineText = headline.text|default:headline %}
-{% set subText = subheadline.text|default:subheadline %}
-{% set descText = description.text|default:description %}
+{% set eyebrowText = eyebrow|get:"text"|default:eyebrow %}
+{% set headlineText = headline|get:"text"|default:headline %}
+{% set subText = subheadline|get:"text"|default:subheadline %}
+{% set descText = description|get:"text"|default:description %}
 {% set pText = ctaPrimary.text %}
 {% set pUrl = ctaPrimary.url %}
 {% set sText = ctaSecondary.text %}
diff --git a/templates/overrides/kindergarten/navbar.ninjatpl b/templates/overrides/kindergarten/navbar.ninjatpl
index 3d5c90c..6aebfa4 100644
--- a/templates/overrides/kindergarten/navbar.ninjatpl
+++ b/templates/overrides/kindergarten/navbar.ninjatpl
@@ -5,7 +5,7 @@
 {% if not sb %}{% if sticky %}{% set sb = "sticky" %}{% else %}{% set sb = "none" %}{% endif %}{% endif %}
 {% set use_mega = megaMenu or template == "mega" %}
 {% set is_transparent = nv == "transparent-over-hero" %}
-{% set cta_text = cta.text|default:ctaLabel %}
+{% set cta_text = cta|get:"text"|default:ctaLabel %}
 {% set cta_url = cta.url|default:ctaUrl %}
 {% set bg = backgroundColor|default:"bg-background" %}
 {% macro navlink(item) %}<a href="{{ item.url|default:'#' }}"{% if item.open_in_new_tab %} target="_blank" rel="noopener"{% endif %}{% if item.title %} title="{{ item.title }}"{% endif %} class="kg-mono px-3 py-2 text-xs font-medium text-foreground/80 hover:text-primary transition-colors {{ item.css_class }}">{{ item.label }}</a>{% endmacro %}