Remove deprecated vertical layout settings; Adjust text markup definitions