updated with new theme