7i96S + 7i85S + THCAD2 firmware?

Hi, I'm currently building myself and hybrid Plasma/Router CNC. 

I originally chose to go with the 7i96S with 2x THCAD2 (Ohmic & Arc), but I ended up adding a 7i85S for more Steps and a 7i84D for a few more Inputs. The idea is to have everything plugged in and relying on LinuxCNC configurations to change between Plasma and Router.
I have 1 X axis, 2 Y axis, 2 Z axis (1 plasma & 1 spindle) and 1 A axis (Rotary axis).

Now, I think I need to compile my own firmware if I want the THCADs to be on the 7i96S and also support the 7i85S right? How can I do that?
Also, I looked at 7i96s_7i85sd.pin and noticed the TB3-1 to TB3-11 have None in "Sec. func" column. Was it just forgotten, or is this by design and I will have to move my Inputs to the 7i84D?

If there is any recommendations here, please go ahead. I probably should have asked before wiring the control box, but it still easy to do any modifications right now since the box is on my desk and not in use in the CNC.
Thanks!

7I96S+7I85S plasma config:

 

Note that because of the use of muxed encoders, the on 7I96S  encoders
are numbered oddly = 4,6,8

The 7i96s_7i85sd.pin file in the distribution is incorrect, but the
7i96s_7i85sd.bin file is OK (it has the INM on the TB3 pins)

Note that you _can_ still use the 7I96/7i96s TB3 inputs without the INM
(GPIO works). There are be 7I96 configurations without the INM
but the 7I96S's larger FPGA means it should always fit

Wow that was fast!
Many thanks to you, really appreciate the work.

Have a great day!