De-remify mixins and extends
Add missing trailing semicolon
Merge branch 'pixrem' into pixrem-1