NB Wiring Diagram (mom switch, rebel led, recharge port, speaker, and 18650 li-ion)

[Bradman9]

I have scoured the diagrams on here for wiring the NB and read and re-read the NB manual many times and I just can't seem to wrap my head completely around it. So, I made a diagram of what I have wired up so far. Nothing is hooked up to the NB module yet as I want to make sure all the components are in order before I hook it up to the NB. I mainly have two questions;

1. Does the wiring look correct?
2. Which version is correct? the wiring (to the switch) in the orange or in the light blue?

Color code:

Orange (no polar charge and are currently hooked up)
Light Blue (these wires aren't hooked up yet. Refer to question 2)
Red (positive charge)
Black (Negative charge)

Link to the picture -----> http://i1286.photobucket.com/albums/a609/Bradman9/WiringDiagramfinished_zpsca71dd08.png

Thanks in advance for any advice/help!!

[Silver Serpent]

The orange wires to your switch should be removed. The rest of it appears correct.

[Bradman9]

Awesome, thank you! :)