Update mixin / class structure to avoid unwanted duplication
Merge pull request #1775 from darkwing/avoid-stylus-dupe

Update mixin / class structure to avoid unwanted duplication