Feature/use pkgkitten