Another big changes, mostly for the inclusion of custom helm keybindings