Removed SpeicalKeys stuff, towards key code unification
DRY up event mapping