Added avatars to New Battle Window & switched backward colours
(unless they were meant to be like that for some reason >_>)
wavy helped test

Got avatars locally, other things (squashed)