Sync Settings v2.2.5

* Minor Fixes
