Added support for battery text color + cleanup