ninka: update to 1.1 and refactor