Fixed colors, added map borders