Update key mappings to work with Vintageous > 3.6.2
Fixed conflicts