Changed sprites to new style, minor style tweaks