Make some colors uniform, fix MAP