Fixed the colors which Ross broke
Merge branch 'master' of https://github.com/CodePilotCo/CMS
More merge things