More font/theme cleanup.