Here's another alternative for the conversion as a whole: a title and a borg party popper--no Marks/BNPs/Dilithium in crates at all! At least that would catch the spirit of this S7 update.

But I guess the crate is just as well. I know, however, that if I see the crate in my inventory, it will make me angry for some time. If they have to punch me in the face, they could at least do it with a party popper!