Revert "circlebattery bugfixes"

This reverts commit d05b7204fda3928f1a55dd4d32c6dd60de1b3318.
Revert "Circle battery bugfixes, margins, per-app-color"

This reverts commit e886461ff0357c6ce964bf3cd6a13e40dc32af85.
Revert "circle battery"

This reverts commit fc0e800e518f755dd7c05e41b777c3413812e038.