No worries, @
Alex will fix that.
As far as the short goes, you need to find it, won't make a difference what kind of taillight you have if the short is still happening.
I've attached the wiring diagram, take a look at it and start chasing that gremlin. Remember to check everything carefully, don't assuming that, something is OK, til you personal verify it.
Also take a look at the link below, might help you out
http://faq.ninja250.org/wiki/Electrical_%26_Lighting