Revert "Fix Possible overdraw: Root element paints background * with a theme that also paints a background"

This reverts commit ea85dac5736cbead9cfd1a8b362c2f288faa2c68.
Fixed lint warnings
Added background color