Added visual and hotkey replacement