Refactored colours into constants
Added colour constant
Resolved merge conflict