Changed references and fonts