Removed fontdeck, added charter, etc