Battery style - various fixes

Squashed commit - credit to @SlimRoms and team

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>