First try on porting things to diagrams 0.7. They work worse then before.

Also added support for fill rules.