Updated with map, riskitems, new styles, etc.