FW mode control group actuators being read in MC mode

I’m having issues where I want different outputs from my control surfaces during FW mode as opposed to MC mode. I’m using the E-flite convergence firmware. So for example, I want my servos to respond to ROLL in forward flight and not YAW, but in MC mode I need them to respond to YAW and not ROLL. Instead whatever I write in the mixer file for FW mode is applied to both FW and MC mode. I think there issue is coming from the “tiltrotor.cpp” source code, where it seems that both Control Group #0 and #1 are summed together instead of read separately depending on the current flight mode.
I’m quite new to Px4 and the coding language, so any help would be much appreciated!