Switch box

This box houses a power switch at the front of the printer and gives me light switch and fan switchs. It's sized to sit in the front left of a Printrbot Plus, but it generic for any printer. I plugged the 25pin plug into the power supply and cut the plug off the other end to give me bare wires to run to the switches. I have power switch connections from pins 15-16, 12v fan power from pins 7-10, and 5v power for a future head light from pins 3-4 (see attached ATX plug pic)
Purchased parts list:
24 Pin Male to 24 Pin Female ATX Extension Cable, Length: 25cm - http://www.amazon.com/gp/product/B00HTQCC68/ref=oh_details_o01_s00_i00?ie=UTF8&psc=1
SPST Rocker Switch - http://www.radioshack.com/product/index.jsp?productId=2103602
SPST 12VDC Illuminated On-Off Toggle Switch with Red LED - http://www.radioshack.com/product/index.jsp?productId=3112835
75-Ft. UL-Recognized Hookup Wire (22AWG) - http://www.radioshack.com/product/index.jsp?productId=2049745&znt_campaign=Category_CMS&znt_source=CAT&znt_medium=RSCOM&znt_content=CT2032227