Updated template with Giga Gengar and Flapple. I also fixed names and type orders and included the form names as well. I am keeping the order as is because I'd rather not break up families between lines.