Fixed colours and added makefile aliasing