Rework marking in various file formats