Various bits of element renaming for clarity
Added facets from data, colour correctly, with some wider style updates to match