add "Shinmon Gateway" and Fix "Bonfire"