Update URLs and fix according to new JSON. Make URLs overridable