Changed some markers
Merge branch 'old_fonts' into alt_fonts