Rare soldiers, naming fixes.

Also added brown, black, white, and melon soldiers.