Graph: Added colours, general cleaning