switch keymaps and behaviors to the new flat syntax

Signed-off-by: Chris Granger <ibdknox@gmail.com>