- Escape key can now be used to cancel preferences dialog.
merged shortcut key changes