got rid of hard coded colour values