Rename the fonts to properly reflect their content
Less magic numbers