Updated settings to v6.x