Refactor Font and Text classes (now material per Text)