There's a lot of LED lights that use 18650 LiIon batteries...
I've been thinking that it could work out well to use the same batteries with a converter module like
https://www.adafruit.com/products/2030 for charging devices.
I'll let you know how it works.