Merged Jonathan's custom sprites into mine 1.5.0

Merged Jonathan's custom sprites into mine