Bug fixes

Fixes:

• #15, crash caused by battery widget when some accessories have batteries
• #57, colors with dashes in the name not found.

Also, FYI: cjbassi#127 and cjbassi#130 were included in the v3.1.0 release, and have been in all releases since.