Make Kinetic Gen toggleable. #22