OH my, now this is a question for me.

I love lights as I've commuted and been riding at night as long as I can remember. Lights have really evolved, as well, in the past 3 years. Now LED is the light of the future, batteries are smaller and everything more affordable.

For commuting <2 hours I use a Vega 200. It has various light settings, charge time of 2 hours, and at full (200 lumens) it runs for 2 hours.. but if you put it at medium/low it runs for much longer.

From there lots and lots of blinky lights. I use a reelight on my front hub so that is always blinking, as well as one on my rear. My rear rack has a long Cat Eye light with various settings. If I have a backpack/messenger bag I also have a light on those.

The other suggestion I have is 3m reflective tape. We sell it by the 3 foot length at the bike shop for <$10. It comes in various colors to better match your bike. I have strips on my rear seat stay, fork legs, and small pieces on my wheels for when they are rotating it catches attention.

Very last thing is I use, if wearing normal clothes, these pant holders made by Trek. They have an led strip in them for steady or blinking and really catch folks eyes as they are blinking and moving when you pedal.