Fix for elusive webfont in customizer and some cleanup.