adjusted for new theme