Move DS2 settings to DS2 ini, clean up general settings