Added new variable keystroke class

Changed dependency on type class to keystroke
Updated settings to reflect changes
Fixes #4585