Rewrite keymap
Add specs for EJS