Adding gradient and stroke support