On branch master - keyboard and touch refactoring

- replace event forwarding with callbacks