A few cool things

I like the new sprites so much so I put them in the UI.

Also some code refactor, and fixed a small bug that didn't let certain variations show.