Merge pull request #127 from lukecampbell/1548style

OOIION-1548 Style Corrections
More sprite mismatch fixes