Rework drawing in various file formats