Add back battery color & fix some strings