Keymap Update

Sped up keymap performance with case breaks