Changed the color scheme for header/footer
Merge branch 'master' into Windows-work