Updates to fix screen shot appearance