Added sprites, fixed alpha.
Fixed merge conflicts.