Refactoring

Draw battery both in dark and light themes