@Todo tasks for GCI

Hardly - especially not in default. Please move into the theme this concerns.