Finish salar rename, and update config

- [x] Finish salar rename
- [x] Update config
- [x] Bugfix with mailx