Hello all, this is my second ever build and I have some questions as I ("think") I found conflicting info between the CFX Manual and the Wiring Diagram on the CFX placemat. It has me confused.

Parts:
Battery: Panasonic 18650 Li-on 3.7v 3400mAh
LED: Tri-Cree XP-E2 Custom (RGB)
12mm blue ring AV switch
Saber Forge Charge Port
22mm Low Profile speaker
Black Momentary Switch (TCSS)

Questions:
1) The CFX Manual shows resistors on the RGB- wires, but the wiring placemat shows a resistor on the positive wires going to the Battery positive. I'm assuming the RGB- wires are the ones that need the resistors but need confirmation.
2) Relating to the question above, will a Dynaohm Resistor be suitable or should I use more specific resistors as per the resistor calculator on the TCSS site?
3) On the Activation Switch, the CFX Placemat wiring diagram shows the red wire running to the pads at the bottom of the board splitting to two different pads. One of them is a dotted line... what is this?
4) I plan on using a simple black momentary switch as a Aux switch for lock ups and blaster sounds. Will that work?
5) Does the rest of my wiring look OK?

Any help is greatly appreciated.

Here is my diagram:

CFX Wiring Diagram 050720.jpg

Diagram from CFX Placemat:

CFX Diagram.jpg