Updates and cleanup and a new default face