Revert "build fixes"

This reverts commit e7e7ff24d5b4c5d4010e51274390f22c83e0f65c.
Revert "Add battery options, clock options, battery text, battery bar and color picker"

This reverts commit 66176e908383f36d1bfeccc87bef957bef0835d0.