added handling for new theme