I added validation properly for safari and reorganized the structure for core/plugins/fonts