Add SHUFFLE_MODE, rename existing to SHUFFLE_REMOTE