[update] Better keyboard support