[Update] Keyboard awesomeness improvement