restructure type
fix web fonts output