Support for PVP Combat

Hi. I'm part of the event called UFP (Ultimate Fighting Princess) which uses Savage Worlds and the Super Powers Companion to roll arenas of super princesses fighting each other. We use FG and we're missing some support for this kind of situation where player characters fight each other (which can happen even in normal games, like when a friendly character is charmed by a spell, for example).
One issue is that Combat Tracker supports to hide/show tokens even for player characters (the eye icon), or even there may be player characters in different "teams", with all the functionality (like group view, for example).

Thanks!

Youtube link fo a UFP look
https://youtu.be/FJj7QDGno4g?list=PLmC-7MprH-MPwDZTMkVbbmXMecWbSETyt&t=2434