Upgraded resources and less plugins