Refactor props for tuna.

Updated them for 4.2.2 as well.

Signed-off-by: iceandfire <arhamjamal@gmail.com>