Updated remaps + plugins