How did you connect the other wires? I went to Radio Shack and bought these "twist on caps". You strip the end of the wire and then twist them together. You then twist this cap on top of it. I have sodered in the past but wasn't comfortable doing it in my X.

If no one replies to the power switch I'll try what you did. I'd rather have it "neater" though. If you know what I mean.