More plot styles, refactor plot metadata