Move the header colors back into header and the footer colors into their
own section.