Revert "Revert "BF: Updated to work with new keyboard events""

This reverts commit 3914b0912f5f902ced7ade94601d56dbe7c8e6e7.