Updated for KeyTap, ScreenTap and Circle Gestures