Clean up shortcuts, move many to xbindkeys