Reorganize, add fonts