couple fixes, include fontawesome in extend subgenerator