Some fixes for battery chart theming