added ability to select stroke colour and fill color