Changes to the header, normalizing it for theme/layout mix and match