* commit '7e0eecc436970d8e67d09b11e36cbbdd55e3aaba': Fix keymap build dependencies and variable name collisions