Fix plot names and ordering, and update config template