Update to colour + geojson