Complete move of color to bundled properties
Remove last property map from graph definition