adding global font variable part 1
fixing merge conflicts