Cleanup + Some setting conversion

* Semicolons, spaces, etc.
* Converting old settings into the new format for now.