more consistent naming for images, new kirby version and new panel