Add fonts, and move to new naming convention.