Improve mapping for leader and ;.
Improve colors.