Revert "Updated a bunch of small user settings"

This reverts commit e25f3efca64ac6e087598477919d161d0c20605a.
Reverting back after screwing up.
Revert e25f3ef..1d5edee

This rolls back to commit e25f3efca64ac6e087598477919d161d0c20605a.