Changed several universal colours to be slightly easier to read
Merge branch 'colour_change'