Undo Header Controller and theming