Added fill and stroke color