Do we want this in a core theme?