Changed FillColor and EmptyColor to props