Re-add files, change ninja to generic kitten