updated for theme presentation