Add flame/fw, remove budle installer