Add colours for more battery glyphs
Cleanup
Added mpd support.