More color changes.  Icons now not mismatching. PS. Battery 'icons' are done in battery.lua, and are actually just a text icon.