Shifted some settings around