Refactor WPF, update shortcuts for winforms