Update manifest
Fix bg-picker bugs