Fix power up shape
Merge branch 'Shape' into Powerups