Attached are screenshots of the new Keyboard Shortcuts editor. I think it is a great improvement over the current version. Much more modern, easier to read, theme aware. Best of all, it is interactive. You can simply press your key combination and the editor will assign it correctly (you can still also check the boxes and select from the list if you prefer).
This will hopefully find its way into the Development branch soon.