Change: type names, "ColorGradient" to "Gradient" and "CanvasState" to "Brush".