This is liable to be a right mess now with crossed switch drops and crossed and interconnected strappers.
Assuming at each switch, you have a cable with Red and Black and two cables with Red, Blue and Yellow
do this at BOTH switches.
L1 - 3 Reds
L2 - Black & 2 Blues
Com - 2 Yellows
Assuming at each switch, you have a cable with Red and Black and two cables with Red, Blue and Yellow
do this at BOTH switches.
L1 - 3 Reds
L2 - Black & 2 Blues
Com - 2 Yellows