Color constants changed from hsl to hex
Merging code