new kirby and linky versions
merged latest version