change colour variable names to be camelcased like everything else