Fixed colouring and aliases