Adjust colours and terminology
Adjust colours and terminology