Shapes now support multiple colours