Tweaks to prepare for Chrome Web Store