Updated some vars to make it work wirh Kirby V2