Update so images are correctly drawn, first pass color was added to image, and default value to custom properties