Merge SettingsRevamp into master

This branch has been out of master for entirely too long