Update color mapping
Fix "space" key mapping