Add mac genres and top feed keys. Fix to PSR standard