Updated default border color and fill color