Hey guys!

Brand new to this forum. I have been reading threads for a while now. Looked up a bunch of different NB diagrams and read the user manual so I hope my diagram is ok!
This will be my first custom saber so I figured I'd go with the NB and not too many bells and whistles.

I did not calculate the resistor's values yet because I am still figuring out what to do for the battery (I live in Canada so I believe my options are 1. get one FedEx to me rather than UPS who cant ship them or 2. Get a battery mount from tcss and buy the battery from a local store). The accent LEDs will go into my crystal chamber!

Anyways, here is my diagram (if you can, please make sure it works with the parts list below) :
Screen Shot 2014-05-24 at 12.39.17 AM.jpg

Here are the parts:
Nano Biscotte V.2
http://www.thecustomsabershop.com/Na...e-V2-P806.aspx

Premium 28mm Speaker
http://www.thecustomsabershop.com/Pr...eaker-P77.aspx

Rebel Star LED & MHS Heatsink (blue)
http://www.thecustomsabershop.com/Re...dule-P653.aspx

MWS Short Momentary 16mm AV Switch - Nickel
http://www.thecustomsabershop.com/MW...ckel-P878.aspx

MWS Recharge Port
http://www.thecustomsabershop.com/MW...Port-P877.aspx

Battery (not sure yet)

Accent LEDs (not sure yet)
Maybe I can get these at a local store. Can anyone tell me if they would work nicely for my crystal chamber? (20mA)
http://www.thesource.ca/estore/produ...roduct=2769082

ALL INPUT WELCOMED

Summary of questions:
1. Is my diagram correct?
2. Did I wire my accent LEDs correctly and would it work well for my crystal chamber?
3. Are there any changes I could make to make my wiring more efficient or to make my design better?
4. Would the LEDs above work well and be bright enough for my crystal chamber?

Thank you so much!