Issue: Spotlight tpl fixed for the new field, modal content theming