Revert "Moved some more settings"

This reverts commit 335c2d1b4e5b79100ab249cf73ba20bf4da8fda2.