Adjust fill method to handle more backgrounds and transparency for pngs