More fill stuff, there's still lines
Merge branch 'master' of https://github.com/MMazzocchi/kiwi