Finalized raw changes for most recent version of the settings interface.

I'm not sure why it replaced some files entirely, maybe something (again) about whitespace changes due to the merge tool used? Maybe we should look into <code>git config core.autocrlf</code>?