fix for broken keyboard settings
bad closing callbacks
Merge remote-tracking branch 'lusito/keyboardfix'