Added trainer highlighting, and edited some colors.