add fonts, more cleanup, switching some colors