Update colors

* Mapkey support
* Better highlight