Fixed some color bugs

also added support for 8 colors on the map