Final updates for Marketplace COS7 theme changes