fix some bug when you use strange keyboard + better matching coloration