Remap arrows