Misc

- Fixes hit testing for multi-fillstyle shapes
- Adds handling of nested definition tags