adjusted for theme updates