UIV-904 logic into theme file for events