I've remapped these like so:

Define keymaps you want to change: https://github.com/joeyagreco/dotfiles/blob/583ba45088239928...

Apply keymaps: https://github.com/joeyagreco/dotfiles/blob/583ba45088239928...

That's it!